From 3f78833e9f06655f43a5ad851d96fb3595da2f99 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 7 Dec 2023 12:45:45 +0530 Subject: [PATCH 01/11] Add `from-file` attribute to matches with origin Adds a new attribute to document the origin path from matches so we can determine in the cases of de-referenced matches, the location these came from, and also to differentiate between matches that come from the same file or from a different file. Signed-off-by: Ayan Sinha Mahapatra --- src/licensedcode/detection.py | 29 +- src/licensedcode/match.py | 15 +- src/licensedcode/plugin_license.py | 12 +- src/packagedcode/licensing.py | 23 +- .../filtered-expected.json | 1 + .../filtered-expected2.json | 1 + .../filtered-expected3.json | 1 + .../data/common/manifests-expected.json | 20 ++ .../data/common/manifests-expected.jsonlines | 28 +- .../data/common/manifests-expected.yaml | 28 +- .../data/csv/livescan/expected.csv | 40 +-- .../data/csv/packages/expected-no-root.csv | 2 +- .../data/csv/packages/expected.csv | 2 +- .../yaml/package-and-licenses-expected.yaml | 15 +- ...e-reference-works-with-clues.expected.json | 27 ++ ...-matched-text-with-reference.expected.json | 5 + .../scan-with-reference.expected.json | 5 + .../data/match_spdx/scan-expected.json | 1 + .../unknown-license-expected.json | 1 + .../unknown-license-text-expected.json | 1 + .../clues/woodstox.expected.json | 3 + .../license-expression/scan.expected.json | 2 + .../spdx-expressions.expected.json | 2 + .../license-ref-see-copying.expected.json | 3 + .../license_reference/scan-ref.expected.json | 3 + ...-unknown-reference-copyright.expected.json | 7 + .../license_reference/scan-wref.expected.json | 1 + ...unknown-ref-to-key-file-root.expected.json | 20 ++ .../license_url/license_url.expected.json | 1 + ...own-intro-eclipse-foundation.expected.json | 4 + .../package/package.expected.json | 3 + .../scan/e2fsprogs-expected.json | 2 + .../scan/ffmpeg-license.expected.json | 15 + .../sqlite/sqlite.expected.json | 136 ++++++++ .../text/scan-diag.expected.json | 2 + .../plugin_license/text/scan.expected.json | 2 + .../text_long_lines/scan-diag.expected.json | 2 + .../text_long_lines/scan.expected.json | 2 + ...n-unknown-intro-dual-license.expected.json | 4 + ...tro-eclipse-foundation-tycho.expected.json | 17 + ...own-intro-eclipse-foundation.expected.json | 2 + ...nown-intro-long-gaps-between.expected.json | 4 + ...intro-with-imperfect-matches.expected.json | 4 + .../file_with_multiple_licenses.expected.json | 2 + .../policy-codebase.expected.json | 5 + .../plugin_license_text/scan.expected.json | 7 + .../data/about/aboutfiles.expected.json | 4 + .../data/about/apipkg.ABOUT-expected | 1 + .../data/about/appdirs.ABOUT-expected | 1 + ...r-layer.tar.xz-get-installed-expected.json | 14 + ...-container-layer.tar.xz-scan-expected.json | 28 ++ .../bluedevil/APKBUILD-expected.json | 1 + .../breeze-grub/APKBUILD-expected.json | 1 + .../breeze-gtk/APKBUILD-expected.json | 1 + .../breeze-plymouth/APKBUILD-expected.json | 1 + .../community/breeze/APKBUILD-expected.json | 1 + .../community/discover/APKBUILD-expected.json | 1 + .../community/drkonqi/APKBUILD-expected.json | 1 + .../jool-modules-lts/APKBUILD-expected.json | 1 + .../jool-modules-rpi/APKBUILD-expected.json | 1 + .../kactivitymanagerd/APKBUILD-expected.json | 1 + .../kde-cli-tools/APKBUILD-expected.json | 1 + .../kde-gtk-config/APKBUILD-expected.json | 1 + .../kdecoration/APKBUILD-expected.json | 1 + .../kdeplasma-addons/APKBUILD-expected.json | 1 + .../community/kgamma5/APKBUILD-expected.json | 1 + .../community/khotkeys/APKBUILD-expected.json | 1 + .../kinfocenter/APKBUILD-expected.json | 1 + .../kmenuedit/APKBUILD-expected.json | 1 + .../community/kscreen/APKBUILD-expected.json | 1 + .../kscreenlocker/APKBUILD-expected.json | 1 + .../ksshaskpass/APKBUILD-expected.json | 1 + .../kwallet-pam/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../kwayland-server/APKBUILD-expected.json | 1 + .../community/kwin/APKBUILD-expected.json | 1 + .../community/kwrited/APKBUILD-expected.json | 1 + .../layer-shell-qt/APKBUILD-expected.json | 1 + .../libkscreen/APKBUILD-expected.json | 1 + .../libksysguard/APKBUILD-expected.json | 1 + .../libreoffice/APKBUILD-expected.json | 1 + .../community/milou/APKBUILD-expected.json | 1 + .../community/mpd/APKBUILD-expected.json | 1 + .../community/oxygen/APKBUILD-expected.json | 1 + .../community/parole/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../plasma-desktop/APKBUILD-expected.json | 1 + .../plasma-disks/APKBUILD-expected.json | 1 + .../plasma-firewall/APKBUILD-expected.json | 1 + .../plasma-integration/APKBUILD-expected.json | 1 + .../plasma-nano/APKBUILD-expected.json | 1 + .../plasma-nm/APKBUILD-expected.json | 1 + .../plasma-pa/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../plasma-sdk/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../plasma-thunderbolt/APKBUILD-expected.json | 1 + .../plasma-vault/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../plasma-workspace/APKBUILD-expected.json | 1 + .../plymouth-kcm/APKBUILD-expected.json | 1 + .../polkit-kde-agent-1/APKBUILD-expected.json | 1 + .../powerdevil/APKBUILD-expected.json | 1 + .../qqc2-breeze-style/APKBUILD-expected.json | 1 + .../qt6-qtbase/APKBUILD-expected.json | 1 + .../rtpengine-lts/APKBUILD-expected.json | 1 + .../community/sddm-kcm/APKBUILD-expected.json | 1 + .../systemsettings/APKBUILD-expected.json | 1 + .../community/ufw/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../main/cmake/APKBUILD-expected.json | 1 + .../main/kamailio/APKBUILD-expected.json | 1 + .../main/libburn/APKBUILD-expected.json | 1 + .../main/linux-lts/APKBUILD-expected.json | 1 + .../main/linux-rpi/APKBUILD-expected.json | 1 + .../main/lua-unit/APKBUILD-expected.json | 1 + .../main/sqlite-tcl/APKBUILD-expected.json | 1 + .../main/sqlite/APKBUILD-expected.json | 1 + .../alpine14/main/sqsh/APKBUILD-expected.json | 1 + .../alpine14/main/sudo/APKBUILD-expected.json | 1 + .../main/util-linux/APKBUILD-expected.json | 1 + .../testing/linux-edge/APKBUILD-expected.json | 1 + .../testing/linux-elm/APKBUILD-expected.json | 1 + .../testing/linux-gru/APKBUILD-expected.json | 1 + .../community/abook/APKBUILD-expected.json | 1 + .../darktable/APKBUILD-expected.json | 1 + .../community/haxe/APKBUILD-expected.json | 1 + .../linux-firmware/APKBUILD-expected.json | 1 + .../community/2bwm/APKBUILD-expected.json | 1 + .../community/acccheck/APKBUILD-expected.json | 1 + .../accerciser/APKBUILD-expected.json | 1 + .../community/alpine/APKBUILD-expected.json | 1 + .../audacious-plugins/APKBUILD-expected.json | 1 + .../boost-build/APKBUILD-expected.json | 1 + .../dircproxy/APKBUILD-expected.json | 1 + .../community/faac/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../community/gcc6/APKBUILD-expected.json | 1 + .../hunspell-de-de/APKBUILD-expected.json | 1 + .../imagemagick/APKBUILD-expected.json | 1 + .../imagemagick6/APKBUILD-expected.json | 1 + .../community/libluv/APKBUILD-expected.json | 1 + .../nymphcast-client/APKBUILD-expected.json | 1 + .../openjdk10/APKBUILD-expected.json | 1 + .../py3-cairosvg/APKBUILD-expected.json | 1 + .../community/qt6-qt3d/APKBUILD-expected.json | 1 + .../ruby-rspec/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../community/vtk/APKBUILD-expected.json | 1 + .../community/zsnes/APKBUILD-expected.json | 1 + .../alpine14/main/gcc/APKBUILD-expected.json | 1 + .../alpine14/main/icu/APKBUILD-expected.json | 1 + .../alpine14/main/ruby/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../gitlab-release-cli/APKBUILD-expected.json | 1 + .../gtksourceviewmm3/APKBUILD-expected.json | 1 + .../testing/pnmixer/APKBUILD-expected.json | 1 + .../APKBUILD-expected.json | 1 + .../buildbot/APKBUILD-expected.json | 1 + .../full-installed/installed-expected.json | 14 + .../rootfs/alpine-rootfs.tar.xz-expected.json | 28 ++ .../single-installed/installed-expected.json | 1 + .../small-installed/installed-expected.json | 14 + .../data/bower/author-objects/expected.json | 3 + .../data/bower/basic/expected.json | 1 + .../data/bower/list-of-licenses/expected.json | 3 + .../data/bower/scan-expected.json | 6 + .../data/build/buck/end2end-expected.json | 1 + .../cargo/cargo_toml/clap/Cargo.toml.expected | 1 + .../cargo_toml/clippy/Cargo.toml.expected | 1 + .../cargo_toml/mdbook/Cargo.toml.expected | 1 + .../cargo_toml/rustfmt/Cargo.toml.expected | 1 + .../cargo_toml/rustup/Cargo.toml.expected | 1 + .../data/cargo/scan.expected.json | 4 + .../data/chef/basic/metadata.json.expected | 1 + .../data/chef/basic/metadata.rb.expected | 1 + .../chef/basic/test_package.json.expected | 1 + ...iew_url_and_bug_tracking_url.json.expected | 1 + .../test_package_dependencies.json.expected | 1 + .../basic/test_package_parties.json.expected | 1 + .../chef/dependencies/metadata.rb.expected | 1 + .../data/chef/package.scan.expected.json | 3 + .../assemble/many-podspecs-expected.json | 12 + .../many-podspecs-with-license-expected.json | 21 ++ .../assemble/multiple-podspec-expected.json | 4 + .../assemble/single-podspec-expected.json | 2 + .../solo/RxDataSources.podspec-expected.json | 2 + ...rebaseAnalytics.podspec.json.expected.json | 1 + .../podspec/BadgeHub.podspec.expected.json | 1 + .../LoadingShimmer.podspec.expected.json | 1 + .../podspec/PayTabsSDK.podspec.expected.json | 1 + .../RxDataSources.podspec.expected.json | 1 + .../podspec/Starscream.podspec.expected.json | 1 + .../podspec/SwiftLib.podspec.expected.json | 1 + ...utter_paytabs_bridge.podspec.expected.json | 1 + .../kmmWebSocket.podspec.expected.json | 1 + .../podspec/nanopb.podspec.expected.json | 1 + .../data/conda/meta.yaml.expected.json | 1 + .../data/cran/codetools/package.json.expected | 1 + .../data/cran/geometry/package.json.expected | 1 + .../data/debian/basic-rootfs-expected.json | 14 + .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 18 ++ ...m_0.12.5-1_copyright-detailed.expected.yml | 5 + .../stable_copyright-detailed.expected.yml | 46 +++ .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 52 +++ .../stable_copyright-detailed.expected.yml | 3 + .../stable_copyright-detailed.expected.yml | 10 + .../stable_copyright-detailed.expected.yml | 5 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 24 ++ .../stable_copyright-detailed.expected.yml | 3 + .../stable_copyright-detailed.expected.yml | 16 + .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 3 + ...sck-static.copyright-detailed.expected.yml | 2 + ...progs-l10n.copyright-detailed.expected.yml | 2 + ...e_libblkid.copyright-detailed.expected.yml | 1 + ...ibcom-err2.copyright-detailed.expected.yml | 1 + ...ble_libss2.copyright-detailed.expected.yml | 1 + ...e_libuuid1.copyright-detailed.expected.yml | 1 + ...e_uuid-dev.copyright-detailed.expected.yml | 1 + ...id-runtime.copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 6 + .../stable_copyright-detailed.expected.yml | 13 + .../stable_copyright-detailed.expected.yml | 2 + .../stable_copyright-detailed.expected.yml | 7 + .../stable_copyright-detailed.expected.yml | 15 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 15 + .../stable_copyright-detailed.expected.yml | 49 +++ .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 10 + .../stable_copyright-detailed.expected.yml | 14 + .../stable_copyright-detailed.expected.yml | 13 + .../stable_copyright-detailed.expected.yml | 2 + .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 9 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 2 + .../stable_copyright-detailed.expected.yml | 2 + .../stable_copyright-detailed.expected.yml | 26 ++ .../stable_copyright-detailed.expected.yml | 10 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 6 + .../stable_copyright-detailed.expected.yml | 16 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 5 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 11 + .../stable_copyright-detailed.expected.yml | 19 ++ .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 7 + .../stable_copyright-detailed.expected.yml | 6 + .../p/perl/copyright-detailed.expected.yml | 233 ++++++++++++++ .../stable_copyright-detailed.expected.yml | 70 +++++ .../stable_copyright-detailed.expected.yml | 8 + .../stable_copyright-detailed.expected.yml | 4 + .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 12 + .../stable_copyright-detailed.expected.yml | 13 + .../stable_copyright-detailed.expected.yml | 10 + .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 24 ++ .../stable_copyright-detailed.expected.yml | 2 + .../stable_copyright-detailed.expected.yml | 13 + .../z3/stable_copyright-detailed.expected.yml | 3 + ...rmware-adi.copyright-detailed.expected.yml | 2 + ...d-graphics.copyright-detailed.expected.yml | 2 + ...re-atheros.copyright-detailed.expected.yml | 7 + ...mware-bnx2.copyright-detailed.expected.yml | 1 + ...ware-bnx2x.copyright-detailed.expected.yml | 1 + ...-brcm80211.copyright-detailed.expected.yml | 1 + ...are-cavium.copyright-detailed.expected.yml | 1 + ...ntel-sound.copyright-detailed.expected.yml | 41 +++ ...intelwimax.copyright-detailed.expected.yml | 1 + ...re-ipw2x00.copyright-detailed.expected.yml | 1 + ...mware-ivtv.copyright-detailed.expected.yml | 1 + ...re-iwlwifi.copyright-detailed.expected.yml | 1 + ...e-libertas.copyright-detailed.expected.yml | 2 + ...ux-nonfree.copyright-detailed.expected.yml | 2 + ...ware-linux.copyright-detailed.expected.yml | 2 + ...sc-nonfree.copyright-detailed.expected.yml | 33 ++ ...re-myricom.copyright-detailed.expected.yml | 1 + ...-netronome.copyright-detailed.expected.yml | 1 + ...are-netxen.copyright-detailed.expected.yml | 1 + ...qcom-media.copyright-detailed.expected.yml | 20 ++ ...are-qlogic.copyright-detailed.expected.yml | 6 + ...are-ralink.copyright-detailed.expected.yml | 2 + ...re-realtek.copyright-detailed.expected.yml | 2 + ...re-samsung.copyright-detailed.expected.yml | 1 + ...ware-siano.copyright-detailed.expected.yml | 1 + ...nnectivity.copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../stable_copyright-detailed.expected.yml | 4 + .../zlib1g/copyright-detailed.expected.yml | 1 + .../adduser/copyright-detailed.expected.yml | 1 + .../doc/apt/copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 3 + .../doc/bash/copyright-detailed.expected.yml | 14 + .../bsdutils/copyright-detailed.expected.yml | 19 ++ .../coreutils/copyright-detailed.expected.yml | 14 + .../doc/dash/copyright-detailed.expected.yml | 8 + .../debconf/copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 2 + .../diffutils/copyright-detailed.expected.yml | 2 + .../doc/dpkg/copyright-detailed.expected.yml | 12 + .../e2fsprogs/copyright-detailed.expected.yml | 3 + .../findutils/copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 73 +++++ .../copyright-detailed.expected.yml | 86 +++++ .../doc/gpgv/copyright-detailed.expected.yml | 14 + .../doc/grep/copyright-detailed.expected.yml | 2 + .../doc/gzip/copyright-detailed.expected.yml | 4 + .../hostname/copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 3 + .../libacl1/copyright-detailed.expected.yml | 7 + .../copyright-detailed.expected.yml | 2 + .../libattr1/copyright-detailed.expected.yml | 7 + .../copyright-detailed.expected.yml | 4 + .../libblkid1/copyright-detailed.expected.yml | 19 ++ .../copyright-detailed.expected.yml | 3 + .../libc-bin/copyright-detailed.expected.yml | 24 ++ .../doc/libc6/copyright-detailed.expected.yml | 24 ++ .../copyright-detailed.expected.yml | 3 + .../copyright-detailed.expected.yml | 1 + .../libcrypt1/copyright-detailed.expected.yml | 33 ++ .../libdb5.3/copyright-detailed.expected.yml | 5 + .../copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 3 + .../libffi7/copyright-detailed.expected.yml | 4 + .../copyright-detailed.expected.yml | 22 ++ .../libgmp10/copyright-detailed.expected.yml | 3 + .../copyright-detailed.expected.yml | 90 ++++++ .../copyright-detailed.expected.yml | 6 + .../copyright-detailed.expected.yml | 44 +++ .../copyright-detailed.expected.yml | 26 ++ .../libidn2-0/copyright-detailed.expected.yml | 8 + .../copyright-detailed.expected.yml | 44 +++ .../copyright-detailed.expected.yml | 4 + .../libkrb5-3/copyright-detailed.expected.yml | 44 +++ .../liblz4-1/copyright-detailed.expected.yml | 5 + .../liblzma5/copyright-detailed.expected.yml | 43 +++ .../libmount1/copyright-detailed.expected.yml | 19 ++ .../copyright-detailed.expected.yml | 26 ++ .../libnsl2/copyright-detailed.expected.yml | 14 + .../copyright-detailed.expected.yml | 8 + .../copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 5 + .../libpcre3/copyright-detailed.expected.yml | 3 + .../copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 4 + .../copyright-detailed.expected.yml | 2 + .../libsepol1/copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 19 ++ .../libss2/copyright-detailed.expected.yml | 1 + .../libssl1.1/copyright-detailed.expected.yml | 1 + .../copyright-detailed.expected.yml | 11 + .../copyright-detailed.expected.yml | 5 + .../libtinfo6/copyright-detailed.expected.yml | 3 + .../copyright-detailed.expected.yml | 9 + .../libudev1/copyright-detailed.expected.yml | 11 + .../copyright-detailed.expected.yml | 11 + .../libuuid1/copyright-detailed.expected.yml | 19 ++ .../copyright-detailed.expected.yml | 3 + .../libzstd1/copyright-detailed.expected.yml | 5 + .../doc/login/copyright-detailed.expected.yml | 3 + .../logsave/copyright-detailed.expected.yml | 3 + .../lsb-base/copyright-detailed.expected.yml | 3 + .../doc/mawk/copyright-detailed.expected.yml | 1 + .../doc/mount/copyright-detailed.expected.yml | 19 ++ .../copyright-detailed.expected.yml | 3 + .../passwd/copyright-detailed.expected.yml | 3 + .../perl-base/copyright-detailed.expected.yml | 220 +++++++++++++ .../doc/sed/copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 2 + .../doc/tar/copyright-detailed.expected.yml | 2 + .../copyright-detailed.expected.yml | 19 ++ .../zlib1g/copyright-detailed.expected.yml | 1 + .../stable_copyright.expected.yml | 18 ++ ...r-layer.tar.xz.get-installed-expected.json | 14 + ...-container-layer.tar.xz.scan-expected.json | 14 + .../freebsd/basic/+COMPACT_MANIFEST.expected | 1 + .../freebsd/basic2/+COMPACT_MANIFEST.expected | 1 + .../dual_license/+COMPACT_MANIFEST.expected | 2 + .../dual_license2/+COMPACT_MANIFEST.expected | 3 + .../multi_license/+COMPACT_MANIFEST.expected | 2 + .../data/haxe/basic/haxelib.json.expected | 1 + .../data/haxe/basic2/haxelib.json.expected | 1 + .../data/haxe/deps/haxelib.json.expected | 1 + .../data/haxe/tags/haxelib.json.expected | 1 + ...cted-with-test-manifests-with-license.json | 10 + ...instance-expected-with-test-manifests.json | 2 + ...n-package-instance-expected-with-uuid.json | 2 + .../python-package-instance-expected.json | 2 + ...ackage-instance-with-license-expected.json | 9 + .../activemq-camel.expected.json | 3 + .../google-built-collection.expected.json | 3 + .../jquery-form-3.51.0.expected.json | 18 ++ .../fizzler.expected.json | 11 + .../flutter_playtabs_bridge.expected.json | 11 + ...ytabs_bridge_without_license.expected.json | 2 + .../nanopb.expected.json | 7 + .../nanopb_without_license.expected.json | 2 + .../reference-to-package/base.expected.json | 5 + .../fusiondirectory.expected.json | 165 ++++++++++ .../google_appengine_sdk.expected.json | 26 ++ .../paddlenlp.expected.json | 22 ++ .../physics.expected.json | 21 ++ .../reference-to-package/samba.expected.json | 71 +++++ .../1.0/aopalliance-1.0.pom.package.json | 1 + .../1.5.3/aspectjrt-1.5.3.pom.package.json | 2 + .../0.0.203/bndlib-0.0.203.pom.package.json | 2 + .../0.0.238/bndlib-0.0.238.pom.package.json | 2 + .../data/m2/bytebuddy/pom.xml.package.json | 1 + .../0.9.0.4/c3p0-0.9.0.4.pom.package.json | 1 + .../1.3/commons-codec-1.3.pom.package.json | 1 + .../commons-collections-3.2.pom.package.json | 1 + .../jsch/0.1.23/jsch-0.1.23.pom.package.json | 2 + .../jsch/0.1.27/jsch-0.1.27.pom.package.json | 1 + .../xstream-parent-1.2.2.pom.package.json | 2 + .../data/m2/depman/foo.pom.package.json | 2 + .../1.8/commons-digester-1.8.pom.package.json | 1 + .../1.0/commons-el-1.0.pom.package.json | 1 + .../1.8.0.7/hsqldb-1.8.0.7.pom.package.json | 2 + .../1.6.2/httpunit-1.6.2.pom.package.json | 2 + .../1.3.1/commons-io-1.3.1.pom.package.json | 1 + .../3.4.GA/javassist-3.4.GA.pom.package.json | 2 + .../1.0/persistence-api-1.0.pom.package.json | 2 + .../3.3.ga/javassist-3.3.ga.pom.package.json | 3 + ...-5.0.0alpha-200607201-119.pom.package.json | 1 + .../jtidy-4aug2000r7-dev.pom.package.json | 1 + .../junit/3.8.1/junit-3.8.1.pom.package.json | 2 + .../junit/3.8.2/junit-3.8.2.pom.package.json | 2 + .../junit/4.4/junit-4.4.pom.package.json | 2 + .../2.1/commons-lang-2.1.pom.package.json | 1 + .../2.3/commons-lang-2.3.pom.package.json | 1 + .../1.2.15/log4j-1.2.15.pom.package.json | 1 + .../commons-logging-1.0.4.pom.package.json | 1 + .../1.1/commons-logging-1.1.pom.package.json | 1 + ...ysql-connector-java-5.0.4.pom.package.json | 2 + .../1.2.3/ehcache-1.2.3.pom.package.json | 3 + .../kxml2/2.2.2/kxml2-2.2.2.pom.package.json | 2 + ...egi-security-parent-1.0.5.pom.package.json | 1 + ...egi-security-parent-1.0.7.pom.package.json | 1 + .../1.1.1/master-1.1.1.pom.package.json | 3 + .../apache/apache/1/apache-1.pom.package.json | 1 + .../apache/apache/3/apache-3.pom.package.json | 1 + .../apache/apache/4/apache-4.pom.package.json | 1 + .../1.22/commons-jaxrs-1.22.pom.package.json | 2 + .../1.1/project-config-1.1.pom.package.json | 1 + .../maven/2.0.1/maven-2.0.1.pom.package.json | 1 + .../maven/2.0.2/maven-2.0.2.pom.package.json | 1 + .../maven/2.0.4/maven-2.0.4.pom.package.json | 1 + .../maven/2.0/maven-2.0.pom.package.json | 1 + ...ven-dependency-plugin-2.0.pom.package.json | 2 + .../wagon-file-1.0-alpha-5.pom.package.json | 1 + ...p-lightweight-1.0-alpha-5.pom.package.json | 1 + ...-provider-api-1.0-alpha-5.pom.package.json | 1 + .../wagon-ssh-1.0-alpha-5.pom.package.json | 1 + .../wagon-1.0-alpha-6.pom.package.json | 1 + .../build/1.1.1/build-1.1.1.pom.package.json | 2 + .../myfaces-master-1.0.5.pom.package.json | 1 + .../1.5/velocity-1.5.pom.package.json | 1 + .../1.5.4/aspectjrt-1.5.4.pom.package.json | 2 + .../1.6.0/aspectjrt-1.6.0.pom.package.json | 2 + .../1.5.4/aspectjtools-1.5.4.pom.package.json | 2 + .../1.6.0/aspectjtools-1.6.0.pom.package.json | 2 + .../aspectjweaver-1.5.4.pom.package.json | 2 + .../aspectjweaver-1.6.0.pom.package.json | 2 + .../aspectj-maven-plugin-1.0.pom.package.json | 1 + ...gin-1.2-20080813.143116-6.pom.package.json | 2 + ...maven-plugin-1.2-SNAPSHOT.pom.package.json | 2 + ...obertura-maven-plugin-2.2.pom.package.json | 1 + ...ndbugs-maven-plugin-1.1.1.pom.package.json | 1 + ...-buildnumber-plugin-0.9.6.pom.package.json | 2 + .../1.0.11/plexus-1.0.11.pom.package.json | 1 + .../2.3/easymock-2.3.pom.package.json | 1 + ...asymockclassextension-2.3.pom.package.json | 1 + ...nate-annotations-3.2.1.ga.pom.package.json | 1 + ...nate-annotations-3.3.1.GA.pom.package.json | 1 + ...mons-annotations-3.0.0.ga.pom.package.json | 1 + ...te-entitymanager-3.2.1.ga.pom.package.json | 1 + ...te-entitymanager-3.3.2.GA.pom.package.json | 1 + .../hibernate-3.2.1.ga.pom.package.json | 1 + .../hibernate-3.2.6.ga.pom.package.json | 1 + .../7/jetty-parent-7.pom.package.json | 2 + .../6.1.5/project-6.1.5.pom.package.json | 2 + .../servlet-api-2.5-6.1.5.pom.package.json | 2 + .../2.5.3/spring-aop-2.5.3.pom.package.json | 1 + .../spring-aspects-2.5.3.pom.package.json | 1 + .../spring-aspects-2.5.4.pom.package.json | 1 + .../2.5.3/spring-beans-2.5.3.pom.package.json | 1 + ...ing-context-support-2.5.3.pom.package.json | 1 + .../spring-context-2.5.3.pom.package.json | 1 + .../2.5.3/spring-core-2.5.3.pom.package.json | 1 + .../2.5.3/spring-jdbc-2.5.3.pom.package.json | 1 + .../2.5.3/spring-orm-2.5.3.pom.package.json | 1 + .../2.5.3/spring-test-2.5.3.pom.package.json | 1 + .../2.5.4/spring-test-2.5.4.pom.package.json | 1 + .../2.5.3/spring-tx-2.5.3.pom.package.json | 1 + .../2.5.3/spring-web-2.5.3.pom.package.json | 1 + .../spring-webmvc-2.5.3.pom.package.json | 1 + .../spring-webmvc-2.5.4.pom.package.json | 1 + .../2.5.4/spring-2.5.4.pom.package.json | 1 + .../testng/5.7/testng-5.7.pom.package.json | 2 + .../testng/5.8/testng-5.8.pom.package.json | 2 + .../p6spy/1.3/p6spy-1.3.pom.package.json | 2 + .../jds-2.17.0718b.pom.package.json | 1 + .../parse_error/jds-3.0.1.pom.package.json | 1 + .../common-object-1.0.2.pom.package.json | 1 + .../osgl-http-1.1.2.pom.package.json | 1 + .../commons-validator-1.2.0.pom.package.json | 1 + .../commons-validator-1.3.1.pom.package.json | 1 + .../1.4/velocity-1.4.pom.package.json | 1 + .../1.0.b2/xml-apis-1.0.b2.pom.package.json | 1 + .../1.1.3.1/xmlpull-1.1.3.1.pom.package.json | 2 + .../aopalliance-1.0.pom.package.json | 2 + .../commons-validator-1.2.0.pom.package.json | 1 + ...ndbugs-maven-plugin-1.1.1.pom.package.json | 1 + .../maven2/foo-pom/foo-pom.xml.package.json | 2 + .../jrecordbind-2.3.4.pom.package.json | 2 + .../maven2/log4j/log4j-pom.xml.package.json | 1 + .../logback-access.pom.package.json | 2 + .../spring-2.5.4.pom.package.json | 1 + .../spring-orm-2.5.3.pom.package.json | 1 + .../spring-webmvc-2.5.3.pom.package.json | 1 + ...ackson-dataformat-xml-2.13.5-expected.json | 10 + .../johnzon-jsonb-1.2.11-expected.json | 8 + .../assemble/numbers-1.7.4-expected.json | 3 + ...htrace-core-4.0.0-incubating-expected.json | 16 + .../data/models/full-expected.json | 1 + .../data/models/simple-expected.json | 1 + .../npm/as_installed/package.json.expected | 1 + .../authors_list_dicts/package.json.expected | 2 + .../package.json.expected | 1 + .../data/npm/casepath/package.json.expected | 1 + .../data/npm/chartist/package.json.expected | 5 + .../data/npm/dist/package.json.expected | 1 + .../npm/double_license/package.json.expected | 2 + .../data/npm/electron/package.expected.json | 2 + .../express-jwt-3.4.0/package.json.expected | 2 + .../data/npm/from_npmjs/package.json.expected | 1 + .../npm/from_tarball/package.json.expected | 1 + .../get_package_resources.scan.expected.json | 2 + .../homepage-as-list/package.json.expected | 1 + .../npm/invalid-dep/package.json.expected | 1 + .../data/npm/keywords/package.json.expected | 1 + .../legacy_license_dict/package.json.expected | 2 + .../data/npm/mime-1.3.4/package.json.expected | 1 + .../package-lock.json-expected | 1 + .../package-lock.json-expected | 1 + .../data/npm/scan-nested/scan.expected.json | 4 + .../data/npm/scoped1/package.json.expected | 1 + .../data/npm/scoped2/package.json.expected | 1 + .../data/npm/sequelize/package.json.expected | 1 + .../data/npm/uri_vcs/package.json.expected | 2 + .../data/npm/urls_dict/package.json.expected | 1 + .../utils-merge-1.0.0/package.json.expected | 2 + .../data/npm/with_name/package.json.expected | 2 + .../nuget/Castle.Core.nuspec.json.expected | 1 + .../EntityFramework.nuspec.json.expected | 1 + .../Microsoft.AspNet.Mvc.nuspec.json.expected | 1 + .../Microsoft.Net.Http.nuspec.json.expected | 1 + .../data/nuget/bootstrap.nuspec.json.expected | 1 + .../jQuery.UI.Combined.nuspec.json.expected | 1 + .../data/opam/sample1/output.opam.expected | 1 + .../data/opam/sample3/output.opam.expected | 1 + .../data/opam/sample4/output.opam.expected | 1 + .../data/opam/sample5/output.opam.expected | 1 + .../data/opam/sample6/output.opam.expected | 1 + .../data/opam/sample7/output.opam.expected | 1 + .../data/opam/sample8/output.opam.expected | 1 + .../a-timer/composer.json.expected | 1 + .../phpcomposer/composer.lock-expected.json | 30 ++ .../phpcomposer/fake/composer.json.expected | 1 + .../phpcomposer/fake2/composer.json.expected | 2 + .../framework/composer.json.expected | 1 + .../phpcomposer/modern/composer.json.expected | 1 + .../phpcomposer/slim/composer.json.expected | 1 + .../data/plugin/about-package-expected.json | 4 + .../data/plugin/bower-package-expected.json | 2 + .../data/plugin/cargo-package-expected.json | 2 + .../data/plugin/chef-package-expected.json | 3 + .../data/plugin/com-package-expected.json | 1 + .../data/plugin/conda-package-expected.json | 2 + .../data/plugin/cran-package-expected.json | 2 + .../data/plugin/freebsd-package-expected.json | 2 + .../get_installed_packages-expected.json | 14 + .../data/plugin/haxe-package-expected.json | 2 + .../data/plugin/maven-package-expected.json | 28 ++ .../maven-package-with-license-expected.json | 28 ++ .../data/plugin/mui-package-expected.json | 1 + .../data/plugin/mun-package-expected.json | 1 + .../data/plugin/nuget-package-expected.json | 2 + .../plugin/phpcomposer-package-expected.json | 2 + .../data/plugin/python-package-expected.json | 14 + .../data/plugin/rpm-package-expected.json | 2 + .../plugin/rubygems-package-expected.json | 2 + .../data/plugin/sys-package-expected.json | 1 + .../data/plugin/tlb-package-expected.json | 1 + .../data/plugin/win_pe-package-expected.json | 1 + .../data/plugin/winmd-package-expected.json | 1 + ...s-1.2.1-py2.py3-none-any.whl-expected.json | 2 + ...commoncode-21.5.12-py3.9.egg-expected.json | 1 + .../scancode_toolkit.egg-info-expected.json | 1 + .../dist-info-metadata/METADATA-expected.json | 2 + .../data/pypi/metadata/PKG-INFO-expected.json | 1 + .../pypi/metadata/v10/PKG-INFO-expected.json | 1 + .../pypi/metadata/v11/PKG-INFO-expected.json | 1 + .../pypi/metadata/v12/PKG-INFO-expected.json | 2 + .../pypi/metadata/v20/PKG-INFO-expected.json | 2 + .../pypi/metadata/v21/PKG-INFO-expected.json | 1 + .../flask_setup.py-expected.json | 2 + .../pyyaml_setup.py-expected.json | 2 + .../requests_setup.py-expected.json | 1 + .../sqlalchemy_setup.py-expected.json | 2 + .../unpack_kwargs_setup.py-expected.json | 1 + .../wheel-0.34.2/setup.cfg-expected.json | 1 + .../with_name-setup.py.expected.json | 1 + .../arpy_setup.py-expected.json | 1 + .../setup.py-expected.json | 2 + .../certifi-2020.6.20/setup.py-expected.json | 2 + .../cffi-1.14.0/setup.py-expected.json | 2 + .../chardet-3.0.4/setup.py-expected.json | 2 + .../docutils-0.16/setup.py-expected.json | 5 + .../idna-2.9/setup.py-expected.json | 2 + .../paho-mqtt-1.5.0/setup.py-expected.json | 3 + .../pexpect-4.6.0/setup.py-expected.json | 2 + .../pip-22.0.4/setup.py-expected.json | 2 + .../pycparser-2.20/setup.py-expected.json | 2 + .../pyserial-3.4/setup.py-expected.json | 2 + .../pytoml-0.1.21/setup.py-expected.json | 2 + .../requests-2.24.0/setup.py-expected.json | 1 + .../setupreader-0.0.3/setup.py-expected.json | 1 + .../six-1.14.0/setup.py-expected.json | 2 + .../urllib3-1.25.9/setup.py-expected.json | 2 + .../setup.py/bluepyopt_setup.py-expected.json | 2 + .../boolean2_py_setup.py-expected.json | 2 + .../setup.py/complex_setup.py-expected.json | 1 + .../container_check_setup.py-expected.json | 2 + .../setup.py/fb303_py_setup.py-expected.json | 1 + .../setup.py/frell_src_setup.py-expected.json | 1 + .../setup.py/interlap_setup.py-expected.json | 2 + .../pypi/setup.py/mb_setup.py-expected.json | 1 + .../pypi/setup.py/ntfs_setup.py-expected.json | 2 + .../setup.py/nvchecker_setup.py-expected.json | 2 + ..._agents_common_code_setup.py-expected.json | 3 + .../packageurl_python_setup.py-expected.json | 2 + .../pipdeptree_setup.py-expected.json | 2 + .../setup.py/pluggy_setup.py-expected.json | 1 + ...pygtrie_with_kwargs_setup.py-expected.json | 2 + .../setup.py/pyrpm_2_setup.py-expected.json | 2 + ...python_publicsuffix_setup.py-expected.json | 2 + ...ology_py_libversion_setup.py-expected.json | 2 + .../setup.py/saneyaml_setup.py-expected.json | 2 + .../setuppycheck_setup.py-expected.json | 1 + .../setup.py/simple-setup.py-expected.json | 4 + .../setup.py/url_py_setup.py-expected.json | 2 + .../pypi/setup.py/venv_setup.py-expected.json | 2 + .../whatsapp-play-setup.py-expected.json | 2 + .../setup.py/xmltodict_setup.py-expected.json | 1 + .../site-packages/site-packages-expected.json | 7 + .../data/pypi/solo-metadata/expected.json | 2 + .../data/pypi/solo-setup/expected.json | 2 + .../pip-22.0.4-pypi-package-expected.json | 8 + ...ip-22.0.4-pypi-package-setup-expected.json | 2 + ....4-pypi-package-with-license-expected.json | 26 ++ .../PyJPString-0.0.3-expected.json | 1 + .../PyJPString-0.0.3-subdir-expected.json | 1 + .../python-mimeparse-1.6.0-expected.json | 1 + .../pyup-django-0.4.0-expected.json | 2 + .../metadata-1.2/anonapi-0.0.19-expected.json | 2 + .../commoncode-21.5.12-expected.json | 1 + .../celery-expected.json | 6 + .../daglib_wheel_extracted-expected.json | 4 + .../Jinja2-2.10.dist-info-expected.json | 2 + ...on_mimeparse-1.6.0.dist-info-expected.json | 1 + .../toml-0.10.1.dist-info-expected.json | 2 + .../urllib3-1.26.4.dist-info-expected.json | 2 + .../haruka_bot-1.2.3.dist-info-expected.json | 2 + .../pip-20.2.2.dist-info-expected.json | 2 + ...plugincode-21.1.21.dist-info-expected.json | 1 + .../anonapi-0.0.19.dist-info-expected.json | 2 + .../android/basic/README.android.expected | 1 + .../chromium/basic/README.chromium.expected | 1 + .../facebook/basic/README.facebook.expected | 1 + .../capital-filename/README.FACEBOOK.expected | 1 + .../README.facebook.expected | 1 + .../README.facebook.expected | 1 + .../project-as-name/README.facebook.expected | 1 + .../README.facebook.expected | 1 + .../README.facebook.expected | 1 + .../setuptools/README.facebook.expected | 1 + .../README.facebook.expected | 1 + .../google/basic/README.google.expected | 1 + .../basic/README.thirdparty.expected | 1 + ...0-4.el6_3.x86_64.rpm-package-expected.json | 1 + .../centos-8-rpms.xmlish-expected.json | 3 + .../fc33-rpms.xmlish-expected.json | 5 + .../openmandriva-rpms.xmlish-expected.json | 2 + .../opensuse-rpms.xmlish-expected.json | 2 + .../rhel-rpms.xmlish-expected.json | 3 + .../bdb-fedora-rootfs.tar.xz-expected.json | 296 ++++++++++++++++++ .../xmlish/centos-5-rpms.xmlish-expected.json | 2 + ...s-5-rpms.xmlish-with-license-expected.json | 2 + .../gem/action_tracker-1.0.2.gem.json | 1 + .../data/rubygems/gem/m2r-2.1.0.gem.json | 1 + .../new/dependabot-omnibus-0.87.15.gem.json | 1 + .../gem/new/hiredis-0.6.3-java.gem.json | 1 + .../rubygems/gem/new/int_time-0.0.2.gem.json | 1 + .../gem/new/jaro_winkler-1.5.1-java.gem.json | 1 + .../rubygems/gem/new/rubocop-0.62.0.gem.json | 1 + ...eLibrary.Caching.dll.package-expected.json | 1 + .../Moq.Silverlight.dll.package-expected.json | 1 + .../Windows.AI.winmd.package-expected.json | 1 + .../_ctypes_test.pyd.package-expected.json | 1 + .../win_pe/chcp.com.package-expected.json | 1 + .../win_pe/clfs.sys.mui.package-expected.json | 1 + .../crypt32.dll.mun.package-expected.json | 1 + .../win_pe/euc-jp.so.package-expected.json | 1 + .../win_pe/file.exe.package-expected.json | 1 + .../libiconv2.dll.package-expected.json | 1 + .../win_pe/libintl3.dll.package-expected.json | 1 + .../win_pe/stdole2.tlb.package-expected.json | 1 + .../data/win_pe/tbs.sys.package-expected.json | 1 + .../win_pe/tre4.dll.package-expected.json | 1 + .../win_pe/zlib1.dll.package-expected.json | 2 + .../data/composer/composer.expected.json | 2 + tests/scancode/data/info/all.expected.json | 2 + .../data/info/all.rooted.expected.json | 2 + .../scancode/data/license_text/test.expected | 1 + .../plugin_only_findings/basic.expected.json | 2 + ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json | 2 + .../classify/with_package_data.expected.json | 4 + .../component-package-build-expected.json | 9 + .../component-package-expected.json | 9 + .../license-holder-rollup-expected.json | 6 + ...iple-same-holder-and-license-expected.json | 4 + ...t-counted-in-license-holders-expected.json | 8 + .../package-fileset-expected.json | 6 + .../package-manifest-expected.json | 3 + ...rectory-with-minority-origin-expected.json | 4 + ...return-nested-local-majority-expected.json | 8 + .../data/score/basic-expected.json | 5 + ...consistent_licenses_copyleft-expected.json | 6 + .../summarycode/data/score/jar-expected.json | 9 + .../score/no_license_ambiguity-expected.json | 10 + .../data/score/no_license_text-expected.json | 3 + ...nflicting_license_categories.expected.json | 7 + .../summary/end-2-end/bug-1141.expected.json | 2 + .../holders/clear_holder.expected.json | 8 + .../holders/combined_holders.expected.json | 8 + .../license_ambiguity/ambiguous.expected.json | 2 + .../unambiguous.expected.json | 4 + .../multiple_package_data.expected.json | 10 + .../single_file/single_file.expected.json | 1 + .../summary-without-holder-pypi.expected.json | 20 ++ ...holder_from_package_resource.expected.json | 3 + .../with_package_data.expected.json | 7 + .../without_package_data.expected.json | 4 + .../tallies/end-2-end/bug-1141.expected.json | 2 + .../full_tallies/tallies.expected.json | 30 ++ .../tallies_by_facet.expected.json | 30 ++ .../tallies_details.expected.json | 30 ++ ...lies_key_files-details.expected.json-lines | 36 ++- .../tallies_key_files.expected.json | 28 ++ .../data/tallies/packages/expected.json | 6 + .../no_todo/base64-arraybuffer.expected.json | 9 + ...ti-orig-tarball-package-expected-diag.json | 2 + .../unknown-license-expected-diag.json | 2 + .../unknown-license-expected.json | 2 + 789 files changed, 4833 insertions(+), 48 deletions(-) diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py index a617735ae53..b0416f4592e 100644 --- a/src/licensedcode/detection.py +++ b/src/licensedcode/detection.py @@ -617,6 +617,7 @@ def from_dict(cls, license_match_mapping): matched_text = license_match_mapping.get("matched_text") or None return cls( + from_file=license_match_mapping["from_file"], start_line=license_match_mapping["start_line"], end_line=license_match_mapping["end_line"], match_score=license_match_mapping["score"], @@ -654,6 +655,7 @@ def to_dict( # Detection Level Information result['score'] = self.score() + result['from_file'] = self.from_file result['start_line'] = self.start_line result['end_line'] = self.end_line result['matched_length'] = self.len() @@ -671,6 +673,21 @@ def to_dict( return result +def populate_matches_with_path(matches, path): + """ + Given `matches` list of LicenseMatch objects, populate the `from_file` + attribute in them with `path` which is the path for the origin file for + that license match. + """ + for match in matches: + # Here if we have the `from_file` attribute populated already, + # they are from other files, and if it's empty, they are from + # the original resource, so we populate the files with the resource + # path for the original resource of their origin + if not match["from_file"]: + match["from_file"] = path + + def collect_license_detections(codebase, include_license_clues=True): """ Return a list of LicenseDetectionFromResult object rehydrated from @@ -680,7 +697,10 @@ def collect_license_detections(codebase, include_license_clues=True): according to their license detections. This is required because package fields are populated in package plugin, which runs before the license plugin, and thus the license plugin step where unknown references to other files are dereferenced - does not show up automatically in package attributes. + does not show up automatically in package attributes. + + Also populate from_file attributes with resource paths for matches which have + origin in the same file. """ has_packages = hasattr(codebase.root, 'package_data') has_licenses = hasattr(codebase.root, 'license_detections') @@ -692,7 +712,11 @@ def collect_license_detections(codebase, include_license_clues=True): resource_license_detections = [] if has_licenses: license_detections = getattr(resource, 'license_detections', []) or [] + for detection in license_detections: + populate_matches_with_path(matches=detection["matches"], path=resource.path) license_clues = getattr(resource, 'license_clues', []) or [] + populate_matches_with_path(matches=license_clues, path=resource.path) + codebase.save_resource(resource) if license_detections: license_detection_objects = detections_from_license_detection_mappings( @@ -729,6 +753,9 @@ def collect_license_detections(codebase, include_license_clues=True): package_license_detections = package["license_detections"] if package_license_detections: + for detection in package_license_detections: + populate_matches_with_path(matches=detection["matches"], path=resource.path) + modified = True package_license_detection_mappings.extend(package_license_detections) detection_is_same, license_expression = verify_package_license_expression( license_detection_mappings=package_license_detections, diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py index 7d7880606e3..8b3f80fbb85 100644 --- a/src/licensedcode/match.py +++ b/src/licensedcode/match.py @@ -223,6 +223,17 @@ class LicenseMatch(object): metadata=dict(help='match end line, 1-based') ) + from_file = attr.ib( + default=None, + metadata=dict( + help='File path where this LicenseMatch was originally detected. ' + 'This needs to be stored as we bring over LicenseMatches from ' + 'other files into LicenseDetection objects now, and we need ' + 'to track the origin for these to be able to determine easily ' + 'which are native to that file.' + ) + ) + query = attr.ib( default=None, metadata=dict(help='Query object for this match') @@ -722,7 +733,7 @@ def matched_text( highlight=True, highlight_matched='{}', highlight_not_matched='[{}]', - _usecache=True + _usecache=True, ): """ Return the matched text for this match or an empty string if no query @@ -763,6 +774,7 @@ def to_dict( include_text=False, license_text_diagnostics=False, whole_lines=True, + file_path=None, ): """ Return a "result" scan data built from a LicenseMatch object. @@ -783,6 +795,7 @@ def to_dict( result['score'] = self.score() result['start_line'] = self.start_line result['end_line'] = self.end_line + result['from_file'] = file_path result['matched_length'] = self.len() result['match_coverage'] = self.coverage() result['matcher'] = self.matcher diff --git a/src/licensedcode/plugin_license.py b/src/licensedcode/plugin_license.py index ecae0a6901b..d5625979f3f 100644 --- a/src/licensedcode/plugin_license.py +++ b/src/licensedcode/plugin_license.py @@ -20,6 +20,7 @@ from licensedcode.cache import build_spdx_license_expression, get_cache from licensedcode.detection import collect_license_detections +from licensedcode.detection import populate_matches_with_path from licensedcode.detection import find_referenced_resource from licensedcode.detection import get_detected_license_expression from licensedcode.detection import get_matches_from_detection_mappings @@ -279,11 +280,14 @@ def add_referenced_filenames_license_matches_for_detections(resource, codebase): modified = True detection_modified = True detections_added.extend(referenced_resource.license_detections) - license_match_mappings.extend( - get_matches_from_detection_mappings( - license_detections=referenced_resource.license_detections - ) + matches_to_extend = get_matches_from_detection_mappings( + license_detections=referenced_resource.license_detections ) + populate_matches_with_path( + matches=matches_to_extend, + path=referenced_resource.path + ) + license_match_mappings.extend(matches_to_extend) if not detection_modified: continue diff --git a/src/packagedcode/licensing.py b/src/packagedcode/licensing.py index daa53483a25..c1896f077d8 100644 --- a/src/packagedcode/licensing.py +++ b/src/packagedcode/licensing.py @@ -25,6 +25,7 @@ from licensedcode.detection import find_referenced_resource from licensedcode.detection import detect_licenses from licensedcode.detection import LicenseDetectionFromResult +from licensedcode.detection import populate_matches_with_path from licensedcode.spans import Span from licensedcode import query @@ -113,11 +114,16 @@ def add_referenced_license_matches_for_package(resource, codebase): if referenced_license_detections: modified = True detection_modified = True - license_match_mappings.extend( - get_matches_from_detection_mappings( - license_detections=referenced_license_detections - ) + matches_to_extend = get_matches_from_detection_mappings( + license_detections=referenced_license_detections ) + # For LicenseMatches with different resources as origin, add the + # resource path to these matches as origin info + populate_matches_with_path( + matches=matches_to_extend, + path=referenced_resource.path + ) + license_match_mappings.extend(matches_to_extend) if not detection_modified: continue @@ -231,6 +237,10 @@ def add_referenced_license_detection_from_package(resource, codebase): for pkg_detection in pkg_detections: modified = True detection_modified = True + populate_matches_with_path( + matches=pkg_detection["matches"], + path=resource.path + ) license_match_mappings.extend(pkg_detection["matches"]) detections_added.append(pkg_detection) analysis = DetectionCategory.UNKNOWN_REFERENCE_IN_FILE_TO_PACKAGE.value @@ -347,6 +357,11 @@ def get_license_detections_from_sibling_file(resource, codebase): license_detections = [] for sibling in siblings: + for detection in sibling.license_detections: + populate_matches_with_path( + matches=detection["matches"], + path=sibling.path + ) license_detections.extend(sibling.license_detections) if not license_detections: diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json index 30539914afd..7bc72657f32 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json @@ -36,6 +36,7 @@ "score": 96.07, "start_line": 7, "end_line": 70, + "from_file": "LICENSE", "matched_length": 367, "match_coverage": 100.0, "matcher": "3-seq", diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json index bf7b6a13ba5..d7cb041614a 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json @@ -36,6 +36,7 @@ "score": 100.0, "start_line": 7, "end_line": 22, + "from_file": "LICENSE2", "matched_length": 145, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json index d163e74b589..30dcc9f173d 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json @@ -36,6 +36,7 @@ "score": 100.0, "start_line": 1, "end_line": 47, + "from_file": "LICENSE3", "matched_length": 303, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json index 98d6c2a4c38..d230a0bb395 100644 --- a/tests/formattedcode/data/common/manifests-expected.json +++ b/tests/formattedcode/data/common/manifests-expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -47,6 +48,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -125,6 +127,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -144,6 +147,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -218,6 +222,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -640,6 +645,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -653,6 +659,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -697,6 +704,7 @@ "score": 16.0, "start_line": 17, "end_line": 19, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -709,6 +717,7 @@ "score": 82.35, "start_line": 18, "end_line": 20, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 14, "match_coverage": 82.35, "matcher": "3-seq", @@ -829,6 +838,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -848,6 +858,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -991,6 +1002,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1009,6 +1021,7 @@ "score": 100.0, "start_line": 20, "end_line": 20, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1133,6 +1146,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1226,6 +1240,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1354,6 +1369,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -1373,6 +1389,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 10, "match_coverage": 100.0, "matcher": "1-hash", @@ -1524,6 +1541,7 @@ "score": 100.0, "start_line": 9, "end_line": 20, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 106, "match_coverage": 100.0, "matcher": "2-aho", @@ -1542,6 +1560,7 @@ "score": 100.0, "start_line": 65, "end_line": 65, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1560,6 +1579,7 @@ "score": 100.0, "start_line": 74, "end_line": 75, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines index c62f0f24dc4..8dfc9abe6f5 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-75-generic-x86_64-with-glibc2.29", - "platform_version": "#82~20.04.1-Ubuntu SMP Wed Jun 7 19:37:37 UTC 2023", - "python_version": "3.8.10 (default, May 26 2023, 14:05:08) \n[GCC 9.4.0]" + "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]" }, - "spdx_license_list_version": "3.21", + "spdx_license_list_version": "3.22", "files_count": 4 } } @@ -66,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -79,6 +80,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -157,6 +159,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -176,6 +179,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -250,6 +254,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -686,6 +691,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -699,6 +705,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -743,6 +750,7 @@ "score": 16.0, "start_line": 17, "end_line": 19, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -755,6 +763,7 @@ "score": 82.35, "start_line": 18, "end_line": 20, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 14, "match_coverage": 82.35, "matcher": "3-seq", @@ -883,6 +892,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -902,6 +912,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -1045,6 +1056,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1063,6 +1075,7 @@ "score": 100.0, "start_line": 20, "end_line": 20, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1195,6 +1208,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1288,6 +1302,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1424,6 +1439,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -1443,6 +1459,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 10, "match_coverage": 100.0, "matcher": "1-hash", @@ -1594,6 +1611,7 @@ "score": 100.0, "start_line": 9, "end_line": 20, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 106, "match_coverage": 100.0, "matcher": "2-aho", @@ -1612,6 +1630,7 @@ "score": 100.0, "start_line": 65, "end_line": 65, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1630,6 +1649,7 @@ "score": 100.0, "start_line": 74, "end_line": 75, + "from_file": "manifests/pypi/bluepyopt_setup.py", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml index 67c870c6053..caaaf63c2ae 100644 --- a/tests/formattedcode/data/common/manifests-expected.yaml +++ b/tests/formattedcode/data/common/manifests-expected.yaml @@ -29,10 +29,10 @@ headers: system_environment: operating_system: linux cpu_architecture: 64 - platform: Linux-5.15.0-84-generic-x86_64-with-glibc2.29 - platform_version: '#93~20.04.1-Ubuntu SMP Wed Sep 6 16:15:40 UTC 2023' - python_version: "3.8.10 (default, May 26 2023, 14:05:08) \n[GCC 9.4.0]" - spdx_license_list_version: '3.21' + 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]" + spdx_license_list_version: '3.22' files_count: 4 summary: declared_license_expression: apache-2.0 AND cddl-1.0 AND mit @@ -96,6 +96,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -107,6 +108,7 @@ packages: - score: '100.0' start_line: 2 end_line: 2 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -172,6 +174,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -186,6 +189,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -250,6 +254,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 + from_file: matched_length: 1 match_coverage: '100.0' matcher: 1-spdx-id @@ -1546,6 +1551,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -1557,6 +1563,7 @@ files: - score: '100.0' start_line: 2 end_line: 2 + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -1598,6 +1605,7 @@ files: - score: '16.0' start_line: 17 end_line: '19' + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -1612,6 +1620,7 @@ files: - score: '82.35' start_line: 18 end_line: 20 + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 14 match_coverage: '82.35' matcher: 3-seq @@ -1736,6 +1745,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/npm-license-mapping/package.json matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -1750,6 +1760,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/npm-license-mapping/package.json matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -1871,6 +1882,7 @@ files: - score: '100.0' start_line: 6 end_line: 6 + from_file: manifests/npm-license-mapping/package.json matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1885,6 +1897,7 @@ files: - score: '100.0' start_line: 20 end_line: 20 + from_file: manifests/npm-license-mapping/package.json matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -2017,6 +2030,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/npm-license-string/package.json matched_length: 1 match_coverage: '100.0' matcher: 1-spdx-id @@ -2096,6 +2110,7 @@ files: - score: '100.0' start_line: 4 end_line: 4 + from_file: manifests/npm-license-string/package.json matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -2234,6 +2249,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/pypi/bluepyopt_setup.py matched_length: 1 match_coverage: '100.0' matcher: 1-hash @@ -2248,6 +2264,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: manifests/pypi/bluepyopt_setup.py matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -2377,6 +2394,7 @@ files: - score: '100.0' start_line: 9 end_line: 20 + from_file: manifests/pypi/bluepyopt_setup.py matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -2403,6 +2421,7 @@ files: - score: '100.0' start_line: 65 end_line: 65 + from_file: manifests/pypi/bluepyopt_setup.py matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -2417,6 +2436,7 @@ files: - score: '100.0' start_line: 74 end_line: 75 + from_file: manifests/pypi/bluepyopt_setup.py matched_length: 10 match_coverage: '100.0' matcher: 2-aho diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv index 0820ff9c809..d8d026d4cef 100644 --- a/tests/formattedcode/data/csv/livescan/expected.csv +++ b/tests/formattedcode/data/csv/livescan/expected.csv @@ -1,20 +1,20 @@ -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__score,start_line,end_line,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__rule_identifier,license_match__rule_relevance,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__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,2021-11-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,,100.00,5,13,85,100.00,2-aho,apache-2.0,apache-2.0_7.RULE,100.00,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,2021-11-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,,100.00,1,12,113,100.00,1-hash,gpl-2.0-plus,gpl-2.0-plus_420.RULE,100.00,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,2021-11-27,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,3,100.00,2-aho,mit,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,136,85.53,3-seq,mit,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -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', 'matches': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, '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 +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__score,start_line,end_line,license_match__from_file,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__rule_identifier,license_match__rule_relevance,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__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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,,100.00,5,13,scan/json2csv.rb,85,100.00,2-aho,apache-2.0,apache-2.0_7.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,100.00,1,12,scan/license,113,100.00,1-hash,gpl-2.0-plus,gpl-2.0-plus_420.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,scan/package.json,3,100.00,2-aho,mit,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,scan/package.json,136,85.53,3-seq,mit,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +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', 'matches': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, '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 731aab85792..9c6abf1a868 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__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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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 954cba6712b..87bbd9060ed 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__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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml index 201578ccbcf..54f77567007 100644 --- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml +++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml @@ -29,10 +29,10 @@ headers: system_environment: operating_system: linux cpu_architecture: 64 - platform: Linux-5.15.0-84-generic-x86_64-with-glibc2.29 - platform_version: '#93~20.04.1-Ubuntu SMP Wed Sep 6 16:15:40 UTC 2023' - python_version: "3.8.10 (default, May 26 2023, 14:05:08) \n[GCC 9.4.0]" - spdx_license_list_version: '3.21' + 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]" + spdx_license_list_version: '3.22' files_count: 4 summary: declared_license_expression: apache-2.0 @@ -92,6 +92,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -812,6 +813,7 @@ files: - score: '80.0' start_line: 3 end_line: 3 + from_file: package-and-licenses/README.txt matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -823,6 +825,7 @@ files: - score: '100.0' start_line: 3 end_line: 3 + from_file: package-and-licenses/README.txt matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +886,7 @@ files: - score: '100.0' start_line: 2 end_line: 202 + from_file: package-and-licenses/apache-2.0.LICENSE matched_length: 1584 match_coverage: '100.0' matcher: 1-hash @@ -1089,6 +1093,7 @@ files: - score: '100.0' start_line: 2 end_line: '19' + from_file: package-and-licenses/mit.LICENSE matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -1182,6 +1187,7 @@ files: - score: '100.0' start_line: 1 end_line: 1 + from_file: package-and-licenses/setup.cfg matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -1220,6 +1226,7 @@ files: - score: '100.0' start_line: 4 end_line: 4 + from_file: package-and-licenses/setup.cfg matched_length: 4 match_coverage: '100.0' matcher: 2-aho 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 83fbe8c3cef..cbc12559974 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 @@ -1195,6 +1195,7 @@ "score": 100.0, "start_line": 23, "end_line": 26, + "from_file": "python.LICENSE", "matched_length": 35, "match_coverage": 100.0, "matcher": "2-aho", @@ -1215,6 +1216,7 @@ "score": 80.0, "start_line": 62, "end_line": 62, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1228,6 +1230,7 @@ "score": 100.0, "start_line": 62, "end_line": 63, + "from_file": "python.LICENSE", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1241,6 +1244,7 @@ "score": 85.0, "start_line": 63, "end_line": 63, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1254,6 +1258,7 @@ "score": 85.0, "start_line": 64, "end_line": 65, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1267,6 +1272,7 @@ "score": 80.0, "start_line": 65, "end_line": 65, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1280,6 +1286,7 @@ "score": 100.0, "start_line": 66, "end_line": 66, + "from_file": "python.LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1293,6 +1300,7 @@ "score": 80.0, "start_line": 68, "end_line": 68, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1306,6 +1314,7 @@ "score": 85.0, "start_line": 71, "end_line": 71, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1326,6 +1335,7 @@ "score": 90.52, "start_line": 77, "end_line": 255, + "from_file": "python.LICENSE", "matched_length": 1385, "match_coverage": 90.52, "matcher": "3-seq", @@ -1339,6 +1349,7 @@ "score": 100.0, "start_line": 257, "end_line": 272, + "from_file": "python.LICENSE", "matched_length": 145, "match_coverage": 100.0, "matcher": "2-aho", @@ -1359,6 +1370,7 @@ "score": 100.0, "start_line": 274, "end_line": 274, + "from_file": "python.LICENSE", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1372,6 +1384,7 @@ "score": 100.0, "start_line": 281, "end_line": 310, + "from_file": "python.LICENSE", "matched_length": 233, "match_coverage": 100.0, "matcher": "2-aho", @@ -1394,6 +1407,7 @@ "score": 100.0, "start_line": 317, "end_line": 317, + "from_file": "python.LICENSE", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1407,6 +1421,7 @@ "score": 100.0, "start_line": 334, "end_line": 351, + "from_file": "python.LICENSE", "matched_length": 174, "match_coverage": 100.0, "matcher": "2-aho", @@ -1429,6 +1444,7 @@ "score": 100.0, "start_line": 369, "end_line": 391, + "from_file": "python.LICENSE", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -1449,6 +1465,7 @@ "score": 100.0, "start_line": 397, "end_line": 419, + "from_file": "python.LICENSE", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -1469,6 +1486,7 @@ "score": 100.0, "start_line": 422, "end_line": 422, + "from_file": "python.LICENSE", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1482,6 +1500,7 @@ "score": 100.0, "start_line": 428, "end_line": 432, + "from_file": "python.LICENSE", "matched_length": 56, "match_coverage": 100.0, "matcher": "2-aho", @@ -1495,6 +1514,7 @@ "score": 100.0, "start_line": 434, "end_line": 434, + "from_file": "python.LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1517,6 +1537,7 @@ "score": 100.0, "start_line": 440, "end_line": 487, + "from_file": "python.LICENSE", "matched_length": 332, "match_coverage": 100.0, "matcher": "2-aho", @@ -1537,6 +1558,7 @@ "score": 100.0, "start_line": 497, "end_line": 548, + "from_file": "python.LICENSE", "matched_length": 453, "match_coverage": 100.0, "matcher": "2-aho", @@ -1557,6 +1579,7 @@ "score": 100.0, "start_line": 552, "end_line": 552, + "from_file": "python.LICENSE", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1570,6 +1593,7 @@ "score": 100.0, "start_line": 554, "end_line": 593, + "from_file": "python.LICENSE", "matched_length": 345, "match_coverage": 100.0, "matcher": "2-aho", @@ -1592,6 +1616,7 @@ "score": 100.0, "start_line": 595, "end_line": 595, + "from_file": "python.LICENSE", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1605,6 +1630,7 @@ "score": 100.0, "start_line": 597, "end_line": 635, + "from_file": "python.LICENSE", "matched_length": 341, "match_coverage": 100.0, "matcher": "2-aho", @@ -1626,6 +1652,7 @@ "score": 33.71, "start_line": 358, "end_line": 363, + "from_file": "python.LICENSE", "matched_length": 59, "match_coverage": 33.71, "matcher": "3-seq", 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 0961d22e759..5387cab7070 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 @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -425,6 +426,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, + "from_file": "scan/copyr.java", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -438,6 +440,7 @@ "score": 100.0, "start_line": 19, "end_line": 19, + "from_file": "scan/copyr.java", "matched_length": 8, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -507,6 +510,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/package.json", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -549,6 +553,7 @@ "score": 100.0, "start_line": 28, "end_line": 28, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 bc6d92045e1..9df375489f1 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 @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -422,6 +423,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, + "from_file": "scan/copyr.java", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -434,6 +436,7 @@ "score": 100.0, "start_line": 19, "end_line": 19, + "from_file": "scan/copyr.java", "matched_length": 8, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -501,6 +504,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/package.json", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -543,6 +547,7 @@ "score": 100.0, "start_line": 28, "end_line": 28, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json index 24c5bfd08f8..b865283e6f3 100644 --- a/tests/licensedcode/data/match_spdx/scan-expected.json +++ b/tests/licensedcode/data/match_spdx/scan-expected.json @@ -21,6 +21,7 @@ "score": 100.0, "start_line": 240, "end_line": 240, + "from_file": "license", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/licensedcode/data/match_unknown/unknown-license-expected.json b/tests/licensedcode/data/match_unknown/unknown-license-expected.json index c1a5d96ae66..f5796a7c9e6 100644 --- a/tests/licensedcode/data/match_unknown/unknown-license-expected.json +++ b/tests/licensedcode/data/match_unknown/unknown-license-expected.json @@ -20,6 +20,7 @@ "score": 86.89, "start_line": 1, "end_line": 10, + "from_file": "unknown.txt", "matched_length": 53, "match_coverage": 100.0, "matcher": "6-unknown", 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 37bdce199fd..b17600e90c3 100644 --- a/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json +++ b/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json @@ -23,6 +23,7 @@ "score": 86.89, "start_line": 1, "end_line": 10, + "from_file": "unknown.txt", "matched_length": 53, "match_coverage": 100.0, "matcher": "6-unknown", diff --git a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json index 753015ff0a7..1d4cceab787 100644 --- a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json +++ b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json @@ -196,6 +196,7 @@ "score": 100.0, "start_line": 2, "end_line": 4, + "from_file": "woodstox/ASL2.0", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -227,6 +228,7 @@ "score": 78.46, "start_line": 1, "end_line": 11, + "from_file": "woodstox/LICENSE", "matched_length": 51, "match_coverage": 78.46, "matcher": "3-seq", @@ -276,6 +278,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": "woodstox/NOTICE", "matched_length": 19, "match_coverage": 100.0, "matcher": "2-aho", 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 2b5a11e1fe6..c34cbf1701e 100644 --- a/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json +++ b/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json @@ -25,6 +25,7 @@ "score": 100.0, "start_line": 4, "end_line": 54, + "from_file": "scan/apache-1.0.txt", "matched_length": 368, "match_coverage": 100.0, "matcher": "2-aho", @@ -54,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 d64ac4ec896..26935de350e 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 @@ -21,6 +21,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "spdx-expressions.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -34,6 +35,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "spdx-expressions.txt", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 394c06b5d66..d7fc5d5f57b 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 @@ -29,6 +29,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "license-ref-see-copying/COPYING", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -60,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "license-ref-see-copying/ref", "matched_length": 8, "match_coverage": 100.0, "matcher": "1-hash", @@ -73,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "license-ref-see-copying/COPYING", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 b4cca34b1a8..cad397b653d 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 @@ -29,6 +29,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan-ref/LICENSE", "matched_length": 10, "match_coverage": 100.0, "matcher": "1-hash", @@ -60,6 +61,7 @@ "score": 100.0, "start_line": 34, "end_line": 34, + "from_file": "scan-ref/license-notice.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -73,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan-ref/LICENSE", "matched_length": 10, "match_coverage": 100.0, "matcher": "1-hash", 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 171ce100093..4a329b251ba 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 @@ -37,6 +37,7 @@ "score": 100.0, "start_line": 7, "end_line": 26, + "from_file": "scan-unknown-reference-copyright/Copyright", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -68,6 +69,7 @@ "score": 100.0, "start_line": 9, "end_line": 9, + "from_file": "scan-unknown-reference-copyright/build_glob.py", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -81,6 +83,7 @@ "score": 100.0, "start_line": 7, "end_line": 26, + "from_file": "scan-unknown-reference-copyright/Copyright", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -114,6 +117,7 @@ "score": 100.0, "start_line": 8, "end_line": 8, + "from_file": "scan-unknown-reference-copyright/c14n.c", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -127,6 +131,7 @@ "score": 100.0, "start_line": 7, "end_line": 26, + "from_file": "scan-unknown-reference-copyright/Copyright", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -180,6 +185,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "scan-unknown-reference-copyright/include/libxml/c14n.h", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -193,6 +199,7 @@ "score": 100.0, "start_line": 7, "end_line": 26, + "from_file": "scan-unknown-reference-copyright/Copyright", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", 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 30c5b469cd3..a4bafb35c83 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 @@ -21,6 +21,7 @@ "score": 100.0, "start_line": 34, "end_line": 34, + "from_file": "scan-without-ref/license-notice.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", 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 a69e5f83ad3..3ded9b6845a 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 @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -68,6 +69,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -99,6 +101,7 @@ "score": 100.0, "start_line": 219, "end_line": 222, + "from_file": "unknown-ref-to-key-file-root/README.md", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -130,6 +133,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "unknown-ref-to-key-file-root/esprima-compare.js", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -143,6 +147,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -156,6 +161,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -189,6 +195,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "unknown-ref-to-key-file-root/generate-index.js", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -202,6 +209,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -215,6 +223,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -248,6 +257,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "unknown-ref-to-key-file-root/index.js", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -261,6 +271,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -274,6 +285,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -307,6 +319,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "unknown-ref-to-key-file-root/js-tokens-3.0.2.ABOUT", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -338,6 +351,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "unknown-ref-to-key-file-root/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -369,6 +383,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "unknown-ref-to-key-file-root/regex.coffee", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -382,6 +397,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -395,6 +411,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -438,6 +455,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "unknown-ref-to-key-file-root/test/index.js", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -451,6 +469,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -464,6 +483,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "unknown-ref-to-key-file-root/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 646cfc7deb1..4701d85917f 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 @@ -30,6 +30,7 @@ "score": 100.0, "start_line": 4, "end_line": 54, + "from_file": "scan/apache-1.0.txt", "matched_length": 368, "match_coverage": 100.0, "matcher": "2-aho", 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 fa434fa53d7..0430b3d065a 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 @@ -6,6 +6,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -19,6 +20,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -32,6 +34,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +48,7 @@ "score": 100.0, "start_line": 8, "end_line": 8, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/licensedcode/data/plugin_license/package/package.expected.json b/tests/licensedcode/data/plugin_license/package/package.expected.json index 3aeaae8b87f..14a16222e59 100644 --- a/tests/licensedcode/data/plugin_license/package/package.expected.json +++ b/tests/licensedcode/data/plugin_license/package/package.expected.json @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -174,6 +175,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -237,6 +239,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json index d6bf6c314c3..66ff2142d4d 100644 --- a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json +++ b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json @@ -18,6 +18,7 @@ "score": 14.39, "start_line": 19, "end_line": 20, + "from_file": "e2fsprogs/e2fsprogs-copyright", "matched_length": 20, "match_coverage": 14.39, "matcher": "3-seq", @@ -43,6 +44,7 @@ "score": 100.0, "start_line": 4, "end_line": 30, + "from_file": "e2fsprogs/e2fsprogs-fsstress", "matched_length": 185, "match_coverage": 100.0, "matcher": "2-aho", 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 fc4770a5db2..412d08d862f 100644 --- a/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json +++ b/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json @@ -47,6 +47,7 @@ "score": 99.09, "start_line": 3, "end_line": 13, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 109, "match_coverage": 99.09, "matcher": "3-seq", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 54, "end_line": 54, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -80,6 +82,7 @@ "score": 99.0, "start_line": 55, "end_line": 55, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -93,6 +96,7 @@ "score": 100.0, "start_line": 56, "end_line": 57, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 25, "match_coverage": 100.0, "matcher": "2-aho", @@ -113,6 +117,7 @@ "score": 100.0, "start_line": 59, "end_line": 59, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -126,6 +131,7 @@ "score": 100.0, "start_line": 62, "end_line": 63, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -139,6 +145,7 @@ "score": 100.0, "start_line": 67, "end_line": 67, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -161,6 +168,7 @@ "score": 90.0, "start_line": 79, "end_line": 79, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -181,6 +189,7 @@ "score": 100.0, "start_line": 88, "end_line": 89, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 20, "match_coverage": 100.0, "matcher": "2-aho", @@ -194,6 +203,7 @@ "score": 100.0, "start_line": 91, "end_line": 91, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -207,6 +217,7 @@ "score": 99.0, "start_line": 94, "end_line": 94, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -226,6 +237,7 @@ "score": 100.0, "start_line": 100, "end_line": 100, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -239,6 +251,7 @@ "score": 75.0, "start_line": 101, "end_line": 101, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -252,6 +265,7 @@ "score": 100.0, "start_line": 102, "end_line": 102, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -265,6 +279,7 @@ "score": 75.0, "start_line": 104, "end_line": 104, + "from_file": "ffmpeg-LICENSE.md", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json index 253043c19f8..c855a8c82d2 100644 --- a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json +++ b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json @@ -30,6 +30,7 @@ "score": 100.0, "start_line": 30, "end_line": 35, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -49,6 +50,7 @@ "score": 100.0, "start_line": 54, "end_line": 59, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -68,6 +70,7 @@ "score": 100.0, "start_line": 77, "end_line": 82, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -87,6 +90,7 @@ "score": 100.0, "start_line": 100, "end_line": 105, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -106,6 +110,7 @@ "score": 100.0, "start_line": 123, "end_line": 128, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -125,6 +130,7 @@ "score": 100.0, "start_line": 146, "end_line": 151, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -144,6 +150,7 @@ "score": 100.0, "start_line": 169, "end_line": 174, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -163,6 +170,7 @@ "score": 100.0, "start_line": 192, "end_line": 197, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -182,6 +190,7 @@ "score": 100.0, "start_line": 215, "end_line": 220, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -201,6 +210,7 @@ "score": 100.0, "start_line": 238, "end_line": 243, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -220,6 +230,7 @@ "score": 100.0, "start_line": 261, "end_line": 266, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -239,6 +250,7 @@ "score": 100.0, "start_line": 284, "end_line": 289, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -258,6 +270,7 @@ "score": 100.0, "start_line": 307, "end_line": 312, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -277,6 +290,7 @@ "score": 100.0, "start_line": 330, "end_line": 335, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -296,6 +310,7 @@ "score": 100.0, "start_line": 353, "end_line": 358, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -315,6 +330,7 @@ "score": 100.0, "start_line": 376, "end_line": 381, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -334,6 +350,7 @@ "score": 100.0, "start_line": 399, "end_line": 404, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -353,6 +370,7 @@ "score": 100.0, "start_line": 422, "end_line": 427, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -372,6 +390,7 @@ "score": 100.0, "start_line": 445, "end_line": 450, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -391,6 +410,7 @@ "score": 100.0, "start_line": 468, "end_line": 473, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -410,6 +430,7 @@ "score": 100.0, "start_line": 491, "end_line": 496, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -429,6 +450,7 @@ "score": 100.0, "start_line": 514, "end_line": 519, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -448,6 +470,7 @@ "score": 100.0, "start_line": 537, "end_line": 542, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -467,6 +490,7 @@ "score": 100.0, "start_line": 560, "end_line": 565, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -486,6 +510,7 @@ "score": 100.0, "start_line": 583, "end_line": 588, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -505,6 +530,7 @@ "score": 100.0, "start_line": 606, "end_line": 611, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -524,6 +550,7 @@ "score": 100.0, "start_line": 629, "end_line": 634, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -543,6 +570,7 @@ "score": 100.0, "start_line": 652, "end_line": 657, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -562,6 +590,7 @@ "score": 100.0, "start_line": 675, "end_line": 680, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -581,6 +610,7 @@ "score": 100.0, "start_line": 698, "end_line": 703, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -600,6 +630,7 @@ "score": 100.0, "start_line": 721, "end_line": 726, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -619,6 +650,7 @@ "score": 100.0, "start_line": 744, "end_line": 749, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -638,6 +670,7 @@ "score": 100.0, "start_line": 767, "end_line": 772, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -657,6 +690,7 @@ "score": 100.0, "start_line": 790, "end_line": 795, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -676,6 +710,7 @@ "score": 100.0, "start_line": 813, "end_line": 818, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -695,6 +730,7 @@ "score": 100.0, "start_line": 836, "end_line": 841, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -714,6 +750,7 @@ "score": 100.0, "start_line": 859, "end_line": 864, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -733,6 +770,7 @@ "score": 100.0, "start_line": 882, "end_line": 887, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -752,6 +790,7 @@ "score": 100.0, "start_line": 905, "end_line": 910, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -771,6 +810,7 @@ "score": 100.0, "start_line": 928, "end_line": 933, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -790,6 +830,7 @@ "score": 100.0, "start_line": 951, "end_line": 956, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -809,6 +850,7 @@ "score": 100.0, "start_line": 974, "end_line": 979, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -828,6 +870,7 @@ "score": 100.0, "start_line": 997, "end_line": 1002, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -847,6 +890,7 @@ "score": 100.0, "start_line": 1020, "end_line": 1025, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -866,6 +910,7 @@ "score": 100.0, "start_line": 1043, "end_line": 1048, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -885,6 +930,7 @@ "score": 100.0, "start_line": 1066, "end_line": 1071, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -904,6 +950,7 @@ "score": 100.0, "start_line": 1089, "end_line": 1094, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -923,6 +970,7 @@ "score": 100.0, "start_line": 1112, "end_line": 1117, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -942,6 +990,7 @@ "score": 100.0, "start_line": 1135, "end_line": 1140, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -961,6 +1010,7 @@ "score": 100.0, "start_line": 1158, "end_line": 1163, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -980,6 +1030,7 @@ "score": 100.0, "start_line": 1181, "end_line": 1186, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -999,6 +1050,7 @@ "score": 100.0, "start_line": 1204, "end_line": 1209, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1018,6 +1070,7 @@ "score": 100.0, "start_line": 1227, "end_line": 1232, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1037,6 +1090,7 @@ "score": 100.0, "start_line": 1250, "end_line": 1255, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1056,6 +1110,7 @@ "score": 100.0, "start_line": 1273, "end_line": 1278, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1075,6 +1130,7 @@ "score": 100.0, "start_line": 1296, "end_line": 1301, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1094,6 +1150,7 @@ "score": 100.0, "start_line": 1319, "end_line": 1324, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1113,6 +1170,7 @@ "score": 100.0, "start_line": 1342, "end_line": 1347, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1132,6 +1190,7 @@ "score": 100.0, "start_line": 1365, "end_line": 1370, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1151,6 +1210,7 @@ "score": 100.0, "start_line": 1388, "end_line": 1393, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1170,6 +1230,7 @@ "score": 100.0, "start_line": 1411, "end_line": 1416, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1189,6 +1250,7 @@ "score": 100.0, "start_line": 1434, "end_line": 1439, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1208,6 +1270,7 @@ "score": 100.0, "start_line": 1457, "end_line": 1462, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1227,6 +1290,7 @@ "score": 100.0, "start_line": 1480, "end_line": 1485, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1246,6 +1310,7 @@ "score": 100.0, "start_line": 1503, "end_line": 1508, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1265,6 +1330,7 @@ "score": 100.0, "start_line": 1526, "end_line": 1531, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1284,6 +1350,7 @@ "score": 100.0, "start_line": 1549, "end_line": 1554, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1303,6 +1370,7 @@ "score": 100.0, "start_line": 1572, "end_line": 1577, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1322,6 +1390,7 @@ "score": 100.0, "start_line": 1595, "end_line": 1600, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1341,6 +1410,7 @@ "score": 100.0, "start_line": 1618, "end_line": 1623, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1360,6 +1430,7 @@ "score": 100.0, "start_line": 1641, "end_line": 1646, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1379,6 +1450,7 @@ "score": 100.0, "start_line": 1664, "end_line": 1669, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1398,6 +1470,7 @@ "score": 100.0, "start_line": 1687, "end_line": 1692, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1417,6 +1490,7 @@ "score": 100.0, "start_line": 1710, "end_line": 1715, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1436,6 +1510,7 @@ "score": 100.0, "start_line": 1733, "end_line": 1738, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1455,6 +1530,7 @@ "score": 100.0, "start_line": 1756, "end_line": 1761, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1474,6 +1550,7 @@ "score": 100.0, "start_line": 1779, "end_line": 1784, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1493,6 +1570,7 @@ "score": 100.0, "start_line": 1802, "end_line": 1807, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1512,6 +1590,7 @@ "score": 100.0, "start_line": 1825, "end_line": 1830, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1531,6 +1610,7 @@ "score": 100.0, "start_line": 1848, "end_line": 1853, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1550,6 +1630,7 @@ "score": 100.0, "start_line": 1871, "end_line": 1876, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1569,6 +1650,7 @@ "score": 100.0, "start_line": 1894, "end_line": 1899, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1588,6 +1670,7 @@ "score": 100.0, "start_line": 1917, "end_line": 1922, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1607,6 +1690,7 @@ "score": 100.0, "start_line": 1940, "end_line": 1945, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1626,6 +1710,7 @@ "score": 100.0, "start_line": 1963, "end_line": 1968, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1645,6 +1730,7 @@ "score": 100.0, "start_line": 1986, "end_line": 1991, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1664,6 +1750,7 @@ "score": 100.0, "start_line": 2009, "end_line": 2014, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1683,6 +1770,7 @@ "score": 100.0, "start_line": 2032, "end_line": 2037, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1702,6 +1790,7 @@ "score": 100.0, "start_line": 2055, "end_line": 2060, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1721,6 +1810,7 @@ "score": 100.0, "start_line": 2078, "end_line": 2083, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1740,6 +1830,7 @@ "score": 100.0, "start_line": 2101, "end_line": 2106, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1759,6 +1850,7 @@ "score": 100.0, "start_line": 2124, "end_line": 2129, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1778,6 +1870,7 @@ "score": 100.0, "start_line": 2147, "end_line": 2152, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1797,6 +1890,7 @@ "score": 100.0, "start_line": 2170, "end_line": 2175, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1816,6 +1910,7 @@ "score": 100.0, "start_line": 2193, "end_line": 2198, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1835,6 +1930,7 @@ "score": 100.0, "start_line": 2216, "end_line": 2221, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1854,6 +1950,7 @@ "score": 100.0, "start_line": 2239, "end_line": 2244, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1873,6 +1970,7 @@ "score": 100.0, "start_line": 2262, "end_line": 2267, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1892,6 +1990,7 @@ "score": 100.0, "start_line": 2285, "end_line": 2290, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1911,6 +2010,7 @@ "score": 100.0, "start_line": 2308, "end_line": 2313, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1930,6 +2030,7 @@ "score": 100.0, "start_line": 2331, "end_line": 2336, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1949,6 +2050,7 @@ "score": 100.0, "start_line": 2354, "end_line": 2359, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1968,6 +2070,7 @@ "score": 100.0, "start_line": 2377, "end_line": 2382, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -1987,6 +2090,7 @@ "score": 100.0, "start_line": 2400, "end_line": 2405, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2006,6 +2110,7 @@ "score": 100.0, "start_line": 2423, "end_line": 2428, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2025,6 +2130,7 @@ "score": 100.0, "start_line": 2446, "end_line": 2451, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2044,6 +2150,7 @@ "score": 100.0, "start_line": 2469, "end_line": 2474, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2063,6 +2170,7 @@ "score": 100.0, "start_line": 2492, "end_line": 2497, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2082,6 +2190,7 @@ "score": 100.0, "start_line": 2515, "end_line": 2520, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2101,6 +2210,7 @@ "score": 100.0, "start_line": 2538, "end_line": 2543, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2120,6 +2230,7 @@ "score": 100.0, "start_line": 2561, "end_line": 2566, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2139,6 +2250,7 @@ "score": 100.0, "start_line": 2584, "end_line": 2589, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2158,6 +2270,7 @@ "score": 100.0, "start_line": 2607, "end_line": 2612, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2177,6 +2290,7 @@ "score": 100.0, "start_line": 2630, "end_line": 2635, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2196,6 +2310,7 @@ "score": 100.0, "start_line": 2653, "end_line": 2658, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2215,6 +2330,7 @@ "score": 100.0, "start_line": 2676, "end_line": 2681, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2234,6 +2350,7 @@ "score": 100.0, "start_line": 2699, "end_line": 2704, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2253,6 +2370,7 @@ "score": 100.0, "start_line": 2722, "end_line": 2727, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2272,6 +2390,7 @@ "score": 100.0, "start_line": 2745, "end_line": 2750, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2291,6 +2410,7 @@ "score": 100.0, "start_line": 2768, "end_line": 2773, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2310,6 +2430,7 @@ "score": 100.0, "start_line": 2791, "end_line": 2796, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2329,6 +2450,7 @@ "score": 100.0, "start_line": 2814, "end_line": 2819, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2348,6 +2470,7 @@ "score": 100.0, "start_line": 2837, "end_line": 2842, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2367,6 +2490,7 @@ "score": 100.0, "start_line": 2860, "end_line": 2865, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2386,6 +2510,7 @@ "score": 100.0, "start_line": 2883, "end_line": 2888, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2405,6 +2530,7 @@ "score": 100.0, "start_line": 2906, "end_line": 2911, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2424,6 +2550,7 @@ "score": 100.0, "start_line": 2929, "end_line": 2934, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2443,6 +2570,7 @@ "score": 100.0, "start_line": 2952, "end_line": 2957, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2462,6 +2590,7 @@ "score": 100.0, "start_line": 2975, "end_line": 2980, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2481,6 +2610,7 @@ "score": 100.0, "start_line": 2998, "end_line": 3003, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2500,6 +2630,7 @@ "score": 100.0, "start_line": 3021, "end_line": 3026, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2519,6 +2650,7 @@ "score": 100.0, "start_line": 3044, "end_line": 3049, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2538,6 +2670,7 @@ "score": 100.0, "start_line": 3067, "end_line": 3072, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2557,6 +2690,7 @@ "score": 100.0, "start_line": 3090, "end_line": 3095, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2576,6 +2710,7 @@ "score": 100.0, "start_line": 3113, "end_line": 3118, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -2595,6 +2730,7 @@ "score": 100.0, "start_line": 3136, "end_line": 3141, + "from_file": "sqlite.tgz/sqlite3-binding2.c", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", 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 b3ee2e2e84c..f76473867ab 100644 --- a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json +++ b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json @@ -27,6 +27,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -58,6 +59,7 @@ "score": 91.43, "start_line": 1, "end_line": 3, + "from_file": "scan/short-license", "matched_length": 32, "match_coverage": 91.43, "matcher": "3-seq", diff --git a/tests/licensedcode/data/plugin_license/text/scan.expected.json b/tests/licensedcode/data/plugin_license/text/scan.expected.json index b3ee2e2e84c..f76473867ab 100644 --- a/tests/licensedcode/data/plugin_license/text/scan.expected.json +++ b/tests/licensedcode/data/plugin_license/text/scan.expected.json @@ -27,6 +27,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -58,6 +59,7 @@ "score": 91.43, "start_line": 1, "end_line": 3, + "from_file": "scan/short-license", "matched_length": 32, "match_coverage": 91.43, "matcher": "3-seq", 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 f5d51654a88..3446170617b 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 @@ -27,6 +27,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -58,6 +59,7 @@ "score": 100.0, "start_line": 89, "end_line": 89, + "from_file": "scan/tocbot.js", "matched_length": 198, "match_coverage": 100.0, "matcher": "2-aho", 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 f5d51654a88..3446170617b 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 @@ -27,6 +27,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -58,6 +59,7 @@ "score": 100.0, "start_line": 89, "end_line": 89, + "from_file": "scan/tocbot.js", "matched_length": 198, "match_coverage": 100.0, "matcher": "2-aho", 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 c273fb339d5..bb5cadd960e 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 @@ -23,6 +23,7 @@ "score": 100.0, "start_line": 43, "end_line": 43, + "from_file": "scan-unknown-intro-dual-license/README.md", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -36,6 +37,7 @@ "score": 50.0, "start_line": 43, "end_line": 43, + "from_file": "scan-unknown-intro-dual-license/README.md", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -49,6 +51,7 @@ "score": 100.0, "start_line": 43, "end_line": 43, + "from_file": "scan-unknown-intro-dual-license/README.md", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -62,6 +65,7 @@ "score": 100.0, "start_line": 43, "end_line": 43, + "from_file": "scan-unknown-intro-dual-license/README.md", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", 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 66dbfb3b1d8..43fe1b8c8da 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 @@ -75,6 +75,7 @@ "score": 100.0, "start_line": 12, "end_line": 25, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "matched_length": 163, "match_coverage": 100.0, "matcher": "2-aho", @@ -95,6 +96,7 @@ "score": 95.0, "start_line": 34, "end_line": 37, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "matched_length": 25, "match_coverage": 100.0, "matcher": "2-aho", @@ -115,6 +117,7 @@ "score": 100.0, "start_line": 44, "end_line": 47, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "matched_length": 75, "match_coverage": 100.0, "matcher": "2-aho", @@ -146,6 +149,7 @@ "score": 100.0, "start_line": 12, "end_line": 25, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 163, "match_coverage": 100.0, "matcher": "2-aho", @@ -166,6 +170,7 @@ "score": 95.0, "start_line": 34, "end_line": 37, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 25, "match_coverage": 100.0, "matcher": "2-aho", @@ -186,6 +191,7 @@ "score": 100.0, "start_line": 44, "end_line": 47, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 75, "match_coverage": 100.0, "matcher": "2-aho", @@ -206,6 +212,7 @@ "score": 100.0, "start_line": 53, "end_line": 54, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 51, "match_coverage": 100.0, "matcher": "2-aho", @@ -226,6 +233,7 @@ "score": 100.0, "start_line": 59, "end_line": 60, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 51, "match_coverage": 100.0, "matcher": "2-aho", @@ -246,6 +254,7 @@ "score": 100.0, "start_line": 65, "end_line": 66, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 51, "match_coverage": 100.0, "matcher": "2-aho", @@ -266,6 +275,7 @@ "score": 100.0, "start_line": 71, "end_line": 72, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "matched_length": 51, "match_coverage": 100.0, "matcher": "2-aho", @@ -297,6 +307,7 @@ "score": 100.0, "start_line": 12, "end_line": 25, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "matched_length": 163, "match_coverage": 100.0, "matcher": "2-aho", @@ -317,6 +328,7 @@ "score": 100.0, "start_line": 40, "end_line": 41, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "matched_length": 49, "match_coverage": 100.0, "matcher": "2-aho", @@ -337,6 +349,7 @@ "score": 100.0, "start_line": 53, "end_line": 54, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "matched_length": 22, "match_coverage": 100.0, "matcher": "2-aho", @@ -350,6 +363,7 @@ "score": 100.0, "start_line": 57, "end_line": 59, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -370,6 +384,7 @@ "score": 100.0, "start_line": 64, "end_line": 85, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "matched_length": 211, "match_coverage": 100.0, "matcher": "2-aho", @@ -401,6 +416,7 @@ "score": 100.0, "start_line": 12, "end_line": 25, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html", "matched_length": 163, "match_coverage": 100.0, "matcher": "2-aho", @@ -421,6 +437,7 @@ "score": 100.0, "start_line": 39, "end_line": 41, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html", "matched_length": 60, "match_coverage": 100.0, "matcher": "2-aho", 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 71e7c9cccb4..d1b6d8dd206 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 @@ -21,6 +21,7 @@ "score": 100.0, "start_line": 4, "end_line": 6, + "from_file": "scan-unknown-intro-eclipse-foundation/README.md", "matched_length": 31, "match_coverage": 100.0, "matcher": "2-aho", @@ -34,6 +35,7 @@ "score": 100.0, "start_line": 8, "end_line": 8, + "from_file": "scan-unknown-intro-eclipse-foundation/README.md", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 61e66494e35..e88fe21c6a6 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 @@ -31,6 +31,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -44,6 +45,7 @@ "score": 100.0, "start_line": 8, "end_line": 14, + "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "matched_length": 93, "match_coverage": 100.0, "matcher": "2-aho", @@ -66,6 +68,7 @@ "score": 100.0, "start_line": 18, "end_line": 18, + "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -79,6 +82,7 @@ "score": 100.0, "start_line": 25, "end_line": 54, + "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "matched_length": 233, "match_coverage": 100.0, "matcher": "2-aho", 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 d57b1c76692..3288e8dc198 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 @@ -23,6 +23,7 @@ "score": 50.0, "start_line": 9, "end_line": 9, + "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -36,6 +37,7 @@ "score": 100.0, "start_line": 11, "end_line": 11, + "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -49,6 +51,7 @@ "score": 100.0, "start_line": 11, "end_line": 13, + "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -62,6 +65,7 @@ "score": 100.0, "start_line": 16, "end_line": 20, + "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 70f1377b3e3..4dfa13a617f 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 @@ -36,6 +36,7 @@ "score": 100.0, "start_line": 1, "end_line": 3, + "from_file": "file_with_multiple_licenses.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -48,6 +49,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "file_with_multiple_licenses.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 8fef8246e44..aa4300ab956 100644 --- a/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json +++ b/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json @@ -116,6 +116,7 @@ "score": 100.0, "start_line": 3, "end_line": 7, + "from_file": "policy-codebase.tgz/policy-codebase/broadcom.txt", "matched_length": 42, "match_coverage": 100.0, "matcher": "2-aho", @@ -172,6 +173,7 @@ "score": 100.0, "start_line": 4, "end_line": 14, + "from_file": "policy-codebase.tgz/policy-codebase/bsd-1988.txt", "matched_length": 120, "match_coverage": 100.0, "matcher": "2-aho", @@ -228,6 +230,7 @@ "score": 100.0, "start_line": 1, "end_line": 10, + "from_file": "policy-codebase.tgz/policy-codebase/esri-devkit.txt", "matched_length": 51, "match_coverage": 100.0, "matcher": "1-hash", @@ -284,6 +287,7 @@ "score": 100.0, "start_line": 1, "end_line": 89, + "from_file": "policy-codebase.tgz/policy-codebase/oracle-java-ee-sdk-2010.txt", "matched_length": 1668, "match_coverage": 100.0, "matcher": "1-hash", @@ -340,6 +344,7 @@ "score": 100.0, "start_line": 1, "end_line": 124, + "from_file": "policy-codebase.tgz/policy-codebase/rh-eula.txt", "matched_length": 1283, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/licensedcode/data/plugin_license_text/scan.expected.json b/tests/licensedcode/data/plugin_license_text/scan.expected.json index 1cd75f3f0df..f424ac19cec 100644 --- a/tests/licensedcode/data/plugin_license_text/scan.expected.json +++ b/tests/licensedcode/data/plugin_license_text/scan.expected.json @@ -84,6 +84,7 @@ "score": 100.0, "start_line": 8, "end_line": 58, + "from_file": "scan/apache-1.0.txt", "matched_length": 368, "match_coverage": 100.0, "matcher": "2-aho", @@ -134,6 +135,7 @@ "score": 100.0, "start_line": 40, "end_line": 90, + "from_file": "scan/apache-with_extra.txt", "matched_length": 368, "match_coverage": 100.0, "matcher": "2-aho", @@ -184,6 +186,7 @@ "score": 100.0, "start_line": 4, "end_line": 13, + "from_file": "scan/copyr.java", "matched_length": 212, "match_coverage": 100.0, "matcher": "2-aho", @@ -204,6 +207,7 @@ "score": 100.0, "start_line": 18, "end_line": 31, + "from_file": "scan/copyr.java", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -254,6 +258,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -304,6 +309,7 @@ "score": 100.0, "start_line": 4, "end_line": 13, + "from_file": "scan/this.java", "matched_length": 212, "match_coverage": 100.0, "matcher": "2-aho", @@ -324,6 +330,7 @@ "score": 100.0, "start_line": 18, "end_line": 31, + "from_file": "scan/this.java", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json index f172a8cc114..441cea36886 100644 --- a/tests/packagedcode/data/about/aboutfiles.expected.json +++ b/tests/packagedcode/data/about/aboutfiles.expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -225,6 +227,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -315,6 +318,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/about/apipkg.ABOUT-expected b/tests/packagedcode/data/about/apipkg.ABOUT-expected index bf8f1764dee..7ccf8414aca 100644 --- a/tests/packagedcode/data/about/apipkg.ABOUT-expected +++ b/tests/packagedcode/data/about/apipkg.ABOUT-expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/about/appdirs.ABOUT-expected b/tests/packagedcode/data/about/appdirs.ABOUT-expected index 652f47f6fcf..6dde7f5a2a6 100644 --- a/tests/packagedcode/data/about/appdirs.ABOUT-expected +++ b/tests/packagedcode/data/about/appdirs.ABOUT-expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 1dd4936ab71..99d01f6bddc 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 @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -252,6 +253,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -353,6 +355,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -499,6 +502,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -708,6 +712,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1160,6 +1165,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1261,6 +1267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1452,6 +1459,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1553,6 +1561,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1642,6 +1651,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1743,6 +1753,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1841,6 +1852,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1930,6 +1942,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2055,6 +2068,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 5698456a8fe..5dcf41e2044 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 @@ -44,6 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -134,6 +135,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -224,6 +226,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -314,6 +317,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -422,6 +426,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -674,6 +679,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -764,6 +770,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -863,6 +870,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -953,6 +961,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1031,6 +1040,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1121,6 +1131,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1199,6 +1210,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1277,6 +1289,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1355,6 +1368,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2177,6 +2191,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -2378,6 +2393,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2471,6 +2487,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -2609,6 +2626,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -2821,6 +2839,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3265,6 +3284,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3358,6 +3378,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3541,6 +3562,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3634,6 +3656,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -3718,6 +3741,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3811,6 +3835,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -3925,6 +3950,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -4009,6 +4035,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -4140,6 +4167,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 734a40db2e4..d30df032a2a 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 21, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 87368017724..ad763409744 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 fccfcfc8b19..a286c304fa7 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 1b91ddc33c4..c70d69698a0 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 e674a0194e6..79483c515ec 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 2f6c464863c..1c78538f2ae 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 20, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 803d5052aac..61389986540 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ea22d4609b3..f53d46a2434 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ea22d4609b3..f53d46a2434 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 05392448809..055a36b5723 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 50d6ca5bab3..cb5b90a1f42 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 25, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 3b692857ee9..52aa5aea87f 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c9ffecb7ef2..c46ed98576e 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 faf28cdc8ea..15cc5031180 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 10, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 4cbdda12c47..89ce01421b9 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ff9454f7fdf..53945afdc20 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 10, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 da8d6c1597f..dc07597f462 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 19, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 af58c326813..9423c9fb6e9 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 d0727a6b655..89b0abf9b9f 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 9ff2c50e146..10c39d3aebf 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 15, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 f1493861310..83e2143c68e 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 c42fd0d5b06..c9ea0849666 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 d2db07b2911..8f7777962f1 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 be8ff4f3f71..b2b85375524 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 20, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 7b0cabd77d2..eeb7cfae4c8 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 20, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 98d41b97074..c543f48e30f 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 bed64ce1185..254b4c8f90e 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 15, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c995d1956f9..2a29a6e2a7a 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 21, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 55377cd4425..9677d33fcf6 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 15, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 8754acd595b..d1a7091aaad 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 86b31662281..45debbd10be 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 25, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 0dfc47e6a11..3953104d402 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 62b0dfd4af0..0d8f36016d9 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 77a9df4f4e4..b29d079af3f 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 a9bb5237af3..899821401c6 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 88126f5824c..21960ea467c 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 9573b221206..966281fe07b 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 102af063939..6f4aeb0f882 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 1022b4741ab..9805be30087 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 36, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 a8f54ff15df..7be5b8a5ef3 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 42e955b399d..0dc7b4a7d47 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 15, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 880df61f278..6e42033c802 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 674f3a2aba5..9aefe28002d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 e2bb5f0ac30..697d4bf6054 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 4a432932883..e5f46a318fb 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 7b07202d21d..bf64721271d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 69cb3375106..fcd9970c586 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 19, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 98f1a7ff3a0..adfaadac9c2 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f090ac99ef3..03c28b593cc 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 49, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 abe5e9cc107..e4a053f7a78 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 89fa3f899b2..9a9d4950112 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 4ee53aadb8b..d5a62410e93 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 21, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 e2078dab9f8..dce751ac85f 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 a1f31e5b6cd..178f7937f7e 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 20, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c1e298b822d..948719f4b63 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 5f7cdeb7b5d..a6bed4d3be7 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 26, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 e09ca31fc28..aae7f53ce07 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ba40900d5b8..89349c47575 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 046dbd2b0aa..12f3dde97a9 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f1677418d8f..b6bc4a320a9 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 0a4f3ead91e..a8ef481d7b3 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 1ea0cb03caf..b6952268895 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 8db4e21745b..d75a234c0cc 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 03e5f9c7691..0d7ba398210 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 da4fb74d14d..28d7ed7a2f4 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 69502daebdf..2d3fc80f927 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 d8e0b82c84e..e5866c898bb 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 4371a512bd9..7ff43594f7c 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 94b0445e2f0..b2d3b29315d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 141ced93698..4e029acc0b8 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 36, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 a0ecb540cae..3d58da47ce9 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 12d39e524b3..87062bcdd33 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 c7469238ba1..422aac21c57 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 fda59a71de7..ca4c5e6071b 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 3eda0782b1c..fccb4233d45 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 2bac5658428..5d21a320e65 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 13, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 afd0ef0d481..161e2365f47 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 e6c2f4b1aec..2b6296e54a2 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 086952d9a12..d7d65cb113a 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 ffead834c0e..340288e0db3 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 c529ac7bc55..e38fdb7de61 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 bc491b90f32..20e14da86ec 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 31, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 5eb5ac50c9e..220147a6fcf 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 7664df06c2a..f1bd9cd2d03 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 94c69d7619a..33cd22b8871 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 235e52fef6d..fc294bef462 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 e1a6cfedb16..8e21906b605 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 83e8b6adb8b..5c54e44df16 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 8565b52bdf2..91493d80386 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 a413659285c..de7c61bd780 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 49466cdcd56..dbc31bb0b0c 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 ae7bf25e154..1d3dc8e13fc 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 e867a883e87..6446cb95d35 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 931f3c5387d..71f0d5b38da 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 d409de6f26b..17e195ee93d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 20, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 f4746d63636..306d29ce032 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 ed6cc2a6d8e..b363c54f2d3 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 a6e4b4fe761..fb9bced430c 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 9a06c72bd4d..60bc48bc021 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 a43d7459364..a4cc2a1c594 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 8e771c12cb1..4d2e888ddb1 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c2dc7f8903f..1d47812971d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 31c42048039..7a4a134b77f 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 5466293aa8c..480319a7fc3 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 85f1315db3a..2e05956c308 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 f42449d8c81..349fb5c7641 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 10, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 b98ef69c7a8..a60bdbf4098 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 d372eaa3bcb..4f53bebc5cd 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 3238d0b12c1..8fa8e61f1e1 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 461f33616f3..926ff8545bd 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 a5ca7d17328..80364b607bd 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 c2735aa73ed..50c8cbd6e76 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 @@ -32,6 +32,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ee61a2cd6b6..9c9df480272 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/alpine/full-installed/installed-expected.json b/tests/packagedcode/data/alpine/full-installed/installed-expected.json index b38d791d16f..3af5edda741 100644 --- a/tests/packagedcode/data/alpine/full-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/full-installed/installed-expected.json @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -136,6 +137,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -274,6 +276,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -592,6 +595,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -847,6 +851,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1030,6 +1035,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1123,6 +1129,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1208,6 +1215,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1312,6 +1320,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1396,6 +1405,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1489,6 +1499,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1573,6 +1584,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1657,6 +1669,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1788,6 +1801,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c1f250891e7..34faa90c932 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 @@ -44,6 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -134,6 +135,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -224,6 +226,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -341,6 +344,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -593,6 +597,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -683,6 +688,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -800,6 +806,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -890,6 +897,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -980,6 +988,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1058,6 +1067,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1148,6 +1158,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1226,6 +1237,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1304,6 +1316,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1382,6 +1395,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2163,6 +2177,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2256,6 +2271,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -2394,6 +2410,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -2721,6 +2738,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3165,6 +3183,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3258,6 +3277,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3432,6 +3452,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3525,6 +3546,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3629,6 +3651,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -3713,6 +3736,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3806,6 +3830,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -3920,6 +3945,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -4004,6 +4030,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -4135,6 +4162,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/alpine/single-installed/installed-expected.json b/tests/packagedcode/data/alpine/single-installed/installed-expected.json index 78717cab5b6..5a3a586203d 100644 --- a/tests/packagedcode/data/alpine/single-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/single-installed/installed-expected.json @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/alpine/small-installed/installed-expected.json b/tests/packagedcode/data/alpine/small-installed/installed-expected.json index 7d1f8bf819c..59812707bca 100644 --- a/tests/packagedcode/data/alpine/small-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/small-installed/installed-expected.json @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -136,6 +137,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -274,6 +276,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -592,6 +595,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -829,6 +833,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1012,6 +1017,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1105,6 +1111,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1181,6 +1188,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1285,6 +1293,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1369,6 +1378,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1462,6 +1472,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -1546,6 +1557,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1630,6 +1642,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1761,6 +1774,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/bower/author-objects/expected.json b/tests/packagedcode/data/bower/author-objects/expected.json index 44ccc965e3a..e24ee29bfe9 100644 --- a/tests/packagedcode/data/bower/author-objects/expected.json +++ b/tests/packagedcode/data/bower/author-objects/expected.json @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -71,6 +72,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -90,6 +92,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/bower/basic/expected.json b/tests/packagedcode/data/bower/basic/expected.json index f9d491cb979..b7d761f6512 100644 --- a/tests/packagedcode/data/bower/basic/expected.json +++ b/tests/packagedcode/data/bower/basic/expected.json @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/bower/list-of-licenses/expected.json b/tests/packagedcode/data/bower/list-of-licenses/expected.json index e6e21eaf2b1..584ab696a50 100644 --- a/tests/packagedcode/data/bower/list-of-licenses/expected.json +++ b/tests/packagedcode/data/bower/list-of-licenses/expected.json @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -64,6 +65,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -83,6 +85,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/bower/scan-expected.json b/tests/packagedcode/data/bower/scan-expected.json index 0383ecab8a1..5f0d1a96336 100644 --- a/tests/packagedcode/data/bower/scan-expected.json +++ b/tests/packagedcode/data/bower/scan-expected.json @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -72,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -91,6 +93,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -233,6 +236,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -252,6 +256,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -271,6 +276,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/build/buck/end2end-expected.json b/tests/packagedcode/data/build/buck/end2end-expected.json index c1a3c2d34f1..165e243c69c 100644 --- a/tests/packagedcode/data/build/buck/end2end-expected.json +++ b/tests/packagedcode/data/build/buck/end2end-expected.json @@ -80,6 +80,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 9066335ceeb..25fd9d59ebc 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 50e8705c3dd..b153bfa63c8 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected @@ -69,6 +69,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 74ccff851c6..ab4869bf09b 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected @@ -55,6 +55,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 a005083f5a3..3d7405ccc43 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected @@ -48,6 +48,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 c1801c22e26..e7cfaa1d511 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json index bf4c6c1c862..d2db5db3cf5 100644 --- a/tests/packagedcode/data/cargo/scan.expected.json +++ b/tests/packagedcode/data/cargo/scan.expected.json @@ -42,6 +42,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -123,6 +124,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -769,6 +771,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -863,6 +866,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/chef/basic/metadata.json.expected b/tests/packagedcode/data/chef/basic/metadata.json.expected index 9c6ed15be21..aacbaa3ee86 100644 --- a/tests/packagedcode/data/chef/basic/metadata.json.expected +++ b/tests/packagedcode/data/chef/basic/metadata.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/chef/basic/metadata.rb.expected b/tests/packagedcode/data/chef/basic/metadata.rb.expected index fff6b1af0b0..df78d1ca8bd 100644 --- a/tests/packagedcode/data/chef/basic/metadata.rb.expected +++ b/tests/packagedcode/data/chef/basic/metadata.rb.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/chef/basic/test_package.json.expected b/tests/packagedcode/data/chef/basic/test_package.json.expected index 6dcff234b0a..33410d06801 100644 --- a/tests/packagedcode/data/chef/basic/test_package.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package.json.expected @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 af10466cee8..7f2b0f81766 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 @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 a9a8a202b31..aa776c3db92 100644 --- a/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 723047ecba1..dec64bb0292 100644 --- a/tests/packagedcode/data/chef/basic/test_package_parties.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package_parties.json.expected @@ -40,6 +40,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected index df1ab60354d..642319e3a2e 100644 --- a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected +++ b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/chef/package.scan.expected.json b/tests/packagedcode/data/chef/package.scan.expected.json index 394344548ae..59cabb7c08e 100644 --- a/tests/packagedcode/data/chef/package.scan.expected.json +++ b/tests/packagedcode/data/chef/package.scan.expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -161,6 +162,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -252,6 +254,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json index a56583b4792..ddde1277f78 100644 --- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -190,6 +192,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -264,6 +267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -338,6 +342,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -412,6 +417,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -613,6 +619,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -693,6 +700,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -773,6 +781,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -853,6 +862,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -933,6 +943,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1013,6 +1024,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 1c9a70fa43e..c2f36e1bdcf 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -190,6 +192,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -264,6 +267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -338,6 +342,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -412,6 +417,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -635,6 +641,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/AWSPluginsCore.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -677,6 +684,7 @@ "score": 100.0, "start_line": 25, "end_line": 25, + "from_file": "many-podspecs/AWSPluginsCore.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -739,6 +747,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -781,6 +790,7 @@ "score": 100.0, "start_line": 17, "end_line": 17, + "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -843,6 +853,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/Amplify.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -885,6 +896,7 @@ "score": 100.0, "start_line": 21, "end_line": 21, + "from_file": "many-podspecs/Amplify.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -947,6 +959,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/AmplifyPlugins.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -989,6 +1002,7 @@ "score": 100.0, "start_line": 24, "end_line": 24, + "from_file": "many-podspecs/AmplifyPlugins.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1051,6 +1065,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/AmplifyTestCommon.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1093,6 +1108,7 @@ "score": 100.0, "start_line": 24, "end_line": 24, + "from_file": "many-podspecs/AmplifyTestCommon.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1155,6 +1171,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1197,6 +1214,7 @@ "score": 100.0, "start_line": 14, "end_line": 14, + "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1251,6 +1269,7 @@ "score": 100.0, "start_line": 2, "end_line": 175, + "from_file": "many-podspecs/amplify-ios.LICENSE", "matched_length": 1405, "match_coverage": 100.0, "matcher": "1-hash", @@ -1327,6 +1346,7 @@ "score": 100.0, "start_line": 2, "end_line": 175, + "from_file": "many-podspecs/amplify-ios.LICENSE", "matched_length": 1405, "match_coverage": 100.0, "matcher": "1-hash", @@ -1461,6 +1481,7 @@ "score": 100.0, "start_line": 2, "end_line": 175, + "from_file": "many-podspecs/amplify-ios.LICENSE", "matched_length": 1405, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json index 32da3deccc3..c59151ae9fa 100644 --- a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -247,6 +249,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -462,6 +465,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json index 6def03c6774..80b4fe6c7f7 100644 --- a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -308,6 +309,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 cbd667882f4..ea44fa27956 100644 --- a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -123,6 +124,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c81838d43c5..b11a1b7d51e 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json index 3e5adce789a..dc8311069fd 100644 --- a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json index d683b25aeb2..b3b83005048 100644 --- a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json index 52f69fb184e..633d3fa6843 100644 --- a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json index 91ba696d0b2..e25fda912b5 100644 --- a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json index 194fa00b6c6..a28f2d198ed 100644 --- a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json index 7a0be572dbb..255ba4e0b56 100644 --- a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 c0d08a9d3a7..5827263af35 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json index cd5558c378a..332140aade1 100644 --- a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json index 9586419c642..c9e51c7990f 100644 --- a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/conda/meta.yaml.expected.json b/tests/packagedcode/data/conda/meta.yaml.expected.json index 3716767347b..0ab02e88c62 100644 --- a/tests/packagedcode/data/conda/meta.yaml.expected.json +++ b/tests/packagedcode/data/conda/meta.yaml.expected.json @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cran/codetools/package.json.expected b/tests/packagedcode/data/cran/codetools/package.json.expected index 1aa73ff23cb..ac9e5138018 100644 --- a/tests/packagedcode/data/cran/codetools/package.json.expected +++ b/tests/packagedcode/data/cran/codetools/package.json.expected @@ -48,6 +48,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cran/geometry/package.json.expected b/tests/packagedcode/data/cran/geometry/package.json.expected index 632c647e617..52ab1da708b 100644 --- a/tests/packagedcode/data/cran/geometry/package.json.expected +++ b/tests/packagedcode/data/cran/geometry/package.json.expected @@ -90,6 +90,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json index 101e0bcab86..23d17a65151 100644 --- a/tests/packagedcode/data/debian/basic-rootfs-expected.json +++ b/tests/packagedcode/data/debian/basic-rootfs-expected.json @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -65,6 +66,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -84,6 +86,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -103,6 +106,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -230,6 +234,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -243,6 +248,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -256,6 +262,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", @@ -389,6 +396,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -408,6 +416,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -427,6 +436,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -446,6 +456,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -528,6 +539,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -541,6 +553,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -554,6 +567,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", 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 45caaa79279..2130623ab94 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 @@ -13,6 +13,7 @@ other_license_detections: - score: '100.0' start_line: 16 end_line: 33 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 4d5b9d0c4c6..1edf82722d6 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 @@ -50,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 71 end_line: 71 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -61,6 +62,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 88 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 1-hash @@ -92,6 +94,7 @@ other_license_detections: - score: '100.0' start_line: 94 end_line: 103 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +119,7 @@ other_license_detections: - score: '100.0' start_line: 118 end_line: 142 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 2-aho @@ -155,6 +159,7 @@ other_license_detections: - score: '100.0' start_line: 172 end_line: '191' + from_file: matched_length: 168 match_coverage: '100.0' matcher: 2-aho @@ -186,6 +191,7 @@ other_license_detections: - score: '100.0' start_line: '197' end_line: 206 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -210,6 +216,7 @@ other_license_detections: - score: '100.0' start_line: 209 end_line: 209 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -221,6 +228,7 @@ other_license_detections: - score: '99.0' start_line: 210 end_line: 222 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -248,6 +256,7 @@ other_license_detections: - score: '100.0' start_line: 224 end_line: 224 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -259,6 +268,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 237 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -286,6 +296,7 @@ other_license_detections: - score: '100.0' start_line: 240 end_line: 272 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 1-hash @@ -333,6 +344,7 @@ other_license_detections: - score: '100.0' start_line: 279 end_line: 302 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -371,6 +383,7 @@ other_license_detections: - score: '100.0' start_line: 306 end_line: 309 + from_file: matched_length: 47 match_coverage: '100.0' matcher: 2-aho @@ -386,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 317 end_line: 335 + from_file: matched_length: 148 match_coverage: '100.0' matcher: 2-aho @@ -419,6 +433,7 @@ other_license_detections: - score: '100.0' start_line: 370 end_line: 391 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -455,6 +470,7 @@ other_license_detections: - score: '100.0' start_line: 395 end_line: 419 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 1-hash @@ -494,6 +510,7 @@ other_license_detections: - score: '100.0' start_line: 422 end_line: 433 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +537,7 @@ other_license_detections: - score: '100.0' start_line: 439 end_line: 454 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 3ea7b27369f..7e0572e41cf 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 @@ -35,6 +35,7 @@ other_license_detections: - score: '100.0' start_line: 67 end_line: 67 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -46,6 +47,7 @@ other_license_detections: - score: '100.0' start_line: 68 end_line: 82 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +77,7 @@ other_license_detections: - score: '100.0' start_line: 84 end_line: 84 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -86,6 +89,7 @@ other_license_detections: - score: '100.0' start_line: 85 end_line: 96 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -109,6 +113,7 @@ other_license_detections: - score: '100.0' start_line: 98 end_line: 99 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho 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 00cef7365ce..b00d5068995 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 @@ -85,6 +85,7 @@ other_license_detections: - score: '100.0' start_line: 109 end_line: 112 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +104,7 @@ other_license_detections: - score: '100.0' start_line: 242 end_line: 243 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -119,6 +121,7 @@ other_license_detections: - score: '100.0' start_line: 296 end_line: 297 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 1-hash @@ -135,6 +138,7 @@ other_license_detections: - score: '100.0' start_line: 314 end_line: 314 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -149,6 +153,7 @@ other_license_detections: - score: '100.0' start_line: 333 end_line: 334 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -165,6 +170,7 @@ other_license_detections: - score: '100.0' start_line: 361 end_line: 369 + from_file: matched_length: 90 match_coverage: '100.0' matcher: 1-hash @@ -188,6 +194,7 @@ other_license_detections: - score: '100.0' start_line: 407 end_line: 408 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -204,6 +211,7 @@ other_license_detections: - score: '96.07' start_line: 464 end_line: 509 + from_file: matched_length: 342 match_coverage: '96.07' matcher: 3-seq @@ -264,6 +272,7 @@ other_license_detections: - score: '80.0' start_line: 521 end_line: 530 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 1-hash @@ -288,6 +297,7 @@ other_license_detections: - score: '100.0' start_line: 533 end_line: 547 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -317,6 +327,7 @@ other_license_detections: - score: '100.0' start_line: 550 end_line: 558 + from_file: matched_length: 96 match_coverage: '100.0' matcher: 1-hash @@ -340,6 +351,7 @@ other_license_detections: - score: '100.0' start_line: 561 end_line: 583 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 1-hash @@ -377,6 +389,7 @@ other_license_detections: - score: '100.0' start_line: 586 end_line: 608 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -414,6 +427,7 @@ other_license_detections: - score: '100.0' start_line: 611 end_line: 635 + from_file: matched_length: 216 match_coverage: '100.0' matcher: 1-hash @@ -453,6 +467,7 @@ other_license_detections: - score: '100.0' start_line: 638 end_line: 665 + from_file: matched_length: 242 match_coverage: '100.0' matcher: 1-hash @@ -495,6 +510,7 @@ other_license_detections: - score: '100.0' start_line: 668 end_line: 696 + from_file: matched_length: 245 match_coverage: '100.0' matcher: 1-hash @@ -538,6 +554,7 @@ other_license_detections: - score: '68.51' start_line: 699 end_line: 719 + from_file: matched_length: 124 match_coverage: '68.51' matcher: 3-seq @@ -573,6 +590,7 @@ other_license_detections: - score: '100.0' start_line: 722 end_line: 731 + from_file: matched_length: 90 match_coverage: '100.0' matcher: 1-hash @@ -597,6 +615,7 @@ other_license_detections: - score: '99.0' start_line: 734 end_line: 736 + from_file: matched_length: 33 match_coverage: '100.0' matcher: 1-hash @@ -614,6 +633,7 @@ other_license_detections: - score: '90.77' start_line: 739 end_line: 745 + from_file: matched_length: 59 match_coverage: '90.77' matcher: 3-seq @@ -635,6 +655,7 @@ other_license_detections: - score: '100.0' start_line: 749 end_line: 750 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -651,6 +672,7 @@ other_license_detections: - score: '100.0' start_line: 94 end_line: 94 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -665,6 +687,7 @@ other_license_detections: - score: '100.0' start_line: 89 end_line: 91 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 1-hash @@ -682,6 +705,7 @@ other_license_detections: - score: '100.0' start_line: 104 end_line: 107 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -700,6 +724,7 @@ other_license_detections: - score: '80.0' start_line: 145 end_line: 145 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -714,6 +739,7 @@ other_license_detections: - score: '100.0' start_line: 141 end_line: 142 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -730,6 +756,7 @@ other_license_detections: - score: '80.0' start_line: 168 end_line: 168 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -744,6 +771,7 @@ other_license_detections: - score: '100.0' start_line: 165 end_line: 165 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -758,6 +786,7 @@ other_license_detections: - score: '100.0' start_line: 178 end_line: 178 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -772,6 +801,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: '197' + from_file: matched_length: 44 match_coverage: '100.0' matcher: 1-hash @@ -790,6 +820,7 @@ other_license_detections: - score: '100.0' start_line: 247 end_line: 247 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -804,6 +835,7 @@ other_license_detections: - score: '100.0' start_line: 249 end_line: 267 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 1-hash @@ -837,6 +869,7 @@ other_license_detections: - score: '100.0' start_line: 277 end_line: 284 + from_file: matched_length: 69 match_coverage: '100.0' matcher: 1-hash @@ -859,6 +892,7 @@ other_license_detections: - score: '100.0' start_line: 324 end_line: 327 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -877,6 +911,7 @@ other_license_detections: - score: '100.0' start_line: 341 end_line: 343 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 1-hash @@ -894,6 +929,7 @@ other_license_detections: - score: '100.0' start_line: 356 end_line: 359 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -912,6 +948,7 @@ other_license_detections: - score: '80.0' start_line: 381 end_line: 381 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -926,6 +963,7 @@ other_license_detections: - score: '100.0' start_line: 378 end_line: 378 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 1-hash @@ -940,6 +978,7 @@ other_license_detections: - score: '100.0' start_line: 387 end_line: 389 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 1-hash @@ -957,6 +996,7 @@ other_license_detections: - score: '90.0' start_line: 402 end_line: 402 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -971,6 +1011,7 @@ other_license_detections: - score: '100.0' start_line: 395 end_line: 399 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -990,6 +1031,7 @@ other_license_detections: - score: '80.0' start_line: 430 end_line: 430 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -1004,6 +1046,7 @@ other_license_detections: - score: '100.0' start_line: 426 end_line: 427 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 1-hash @@ -1020,6 +1063,7 @@ other_license_detections: - score: '100.0' start_line: 435 end_line: 436 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -1036,6 +1080,7 @@ other_license_detections: - score: '80.0' start_line: 461 end_line: 461 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1050,6 +1095,7 @@ other_license_detections: - score: '100.0' start_line: 458 end_line: 458 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash 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 e5484becf53..2d17dbd654f 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 20 end_line: 26 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 2-aho 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 938e0b0d134..565c2490d81 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 24 end_line: 24 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -87,6 +88,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 32 + from_file: matched_length: 68 match_coverage: '100.0' matcher: 1-hash @@ -109,6 +111,7 @@ other_license_detections: - score: '100.0' start_line: 50 end_line: 57 + from_file: matched_length: 68 match_coverage: '100.0' matcher: 2-aho @@ -128,6 +131,7 @@ other_license_detections: - score: '100.0' start_line: 59 end_line: 71 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 2-aho @@ -152,6 +156,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 79 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 155 end_line: 163 + from_file: matched_length: 76 match_coverage: '100.0' matcher: 2-aho @@ -193,6 +199,7 @@ other_license_detections: - score: '100.0' start_line: 165 end_line: 168 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 2-aho @@ -208,6 +215,7 @@ other_license_detections: - score: '100.0' start_line: 170 end_line: 176 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -229,6 +237,7 @@ other_license_detections: - score: '100.0' start_line: 186 end_line: 201 + from_file: matched_length: 139 match_coverage: '100.0' matcher: 1-hash @@ -256,6 +265,7 @@ other_license_detections: - score: '100.0' start_line: 203 end_line: 209 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -277,6 +287,7 @@ other_license_detections: - score: '100.0' start_line: 217 end_line: 230 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 1-hash @@ -302,6 +313,7 @@ other_license_detections: - score: '100.0' start_line: 232 end_line: 238 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -323,6 +335,7 @@ other_license_detections: - score: '100.0' start_line: 245 end_line: 258 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -348,6 +361,7 @@ other_license_detections: - score: '100.0' start_line: 260 end_line: 266 + from_file: matched_length: 62 match_coverage: '100.0' matcher: 1-hash @@ -369,6 +383,7 @@ other_license_detections: - score: '100.0' start_line: 376 end_line: 386 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 1-hash @@ -394,6 +409,7 @@ other_license_detections: - score: '100.0' start_line: 407 end_line: 409 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -411,6 +427,7 @@ other_license_detections: - score: '100.0' start_line: 417 end_line: 418 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -427,6 +444,7 @@ other_license_detections: - score: '100.0' start_line: 446 end_line: 453 + from_file: matched_length: 63 match_coverage: '100.0' matcher: 1-hash @@ -449,6 +467,7 @@ other_license_detections: - score: '100.0' start_line: 460 end_line: 463 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -467,6 +486,7 @@ other_license_detections: - score: '100.0' start_line: 470 end_line: 473 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 1-hash @@ -485,6 +505,7 @@ other_license_detections: - score: '100.0' start_line: 482 end_line: 511 + from_file: matched_length: 233 match_coverage: '100.0' matcher: 1-hash @@ -529,6 +550,7 @@ other_license_detections: - score: '70.0' start_line: 518 end_line: 518 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -540,6 +562,7 @@ other_license_detections: - score: '70.0' start_line: 519 end_line: 519 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -554,6 +577,7 @@ other_license_detections: - score: '100.0' start_line: 526 end_line: 526 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -568,6 +592,7 @@ other_license_detections: - score: '100.0' start_line: 533 end_line: 533 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -582,6 +607,7 @@ other_license_detections: - score: '100.0' start_line: 543 end_line: 560 + from_file: matched_length: 168 match_coverage: '100.0' matcher: 1-hash @@ -614,6 +640,7 @@ other_license_detections: - score: '100.0' start_line: 565 end_line: 565 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -625,6 +652,7 @@ other_license_detections: - score: '70.0' start_line: 569 end_line: 569 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -639,6 +667,7 @@ other_license_detections: - score: '100.0' start_line: 579 end_line: 589 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 1-hash @@ -661,6 +690,7 @@ other_license_detections: - score: '100.0' start_line: 591 end_line: 602 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -687,6 +717,7 @@ other_license_detections: - score: '100.0' start_line: 610 end_line: 628 + from_file: matched_length: 169 match_coverage: '100.0' matcher: 1-hash @@ -717,6 +748,7 @@ other_license_detections: - score: '100.0' start_line: 630 end_line: 636 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -738,6 +770,7 @@ other_license_detections: - score: '100.0' start_line: 638 end_line: 638 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -749,6 +782,7 @@ other_license_detections: - score: '100.0' start_line: 639 end_line: 647 + from_file: matched_length: 79 match_coverage: '100.0' matcher: 1-hash @@ -772,6 +806,7 @@ other_license_detections: - score: '100.0' start_line: 649 end_line: 649 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -783,6 +818,7 @@ other_license_detections: - score: '100.0' start_line: 650 end_line: 657 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 1-hash @@ -805,6 +841,7 @@ other_license_detections: - score: '100.0' start_line: 668 end_line: 683 + from_file: matched_length: 160 match_coverage: '100.0' matcher: 1-hash @@ -835,6 +872,7 @@ other_license_detections: - score: '100.0' start_line: 686 end_line: 705 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash @@ -869,6 +907,7 @@ other_license_detections: - score: '100.0' start_line: 708 end_line: 730 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -906,6 +945,7 @@ other_license_detections: - score: '100.0' start_line: 733 end_line: 747 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -935,6 +975,7 @@ other_license_detections: - score: '100.0' start_line: 34 end_line: 40 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -956,6 +997,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 79 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -977,6 +1019,7 @@ other_license_detections: - score: '100.0' start_line: 121 end_line: 127 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -998,6 +1041,7 @@ other_license_detections: - score: '100.0' start_line: 135 end_line: 141 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -1019,6 +1063,7 @@ other_license_detections: - score: '100.0' start_line: 170 end_line: 176 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -1040,6 +1085,7 @@ other_license_detections: - score: '100.0' start_line: 203 end_line: 209 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -1061,6 +1107,7 @@ other_license_detections: - score: '100.0' start_line: 232 end_line: 238 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash @@ -1082,6 +1129,7 @@ other_license_detections: - score: '100.0' start_line: 260 end_line: 266 + from_file: matched_length: 62 match_coverage: '100.0' matcher: 1-hash @@ -1103,6 +1151,7 @@ other_license_detections: - score: '20.2' start_line: 293 end_line: 296 + from_file: matched_length: 41 match_coverage: '20.2' matcher: 3-seq @@ -1118,6 +1167,7 @@ other_license_detections: - score: '100.0' start_line: 298 end_line: 298 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -1132,6 +1182,7 @@ other_license_detections: - score: '100.0' start_line: 591 end_line: 602 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -1158,6 +1209,7 @@ other_license_detections: - score: '100.0' start_line: 630 end_line: 636 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash 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 11b7244840e..c3a996218f0 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 @@ -11,6 +11,7 @@ other_license_detections: - score: '100.0' start_line: 24 end_line: 24 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -22,6 +23,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 32 + from_file: matched_length: 68 match_coverage: '100.0' matcher: 1-hash @@ -44,6 +46,7 @@ other_license_detections: - score: '100.0' start_line: 34 end_line: 40 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 1-hash 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 d6ab9a6bd5a..a58e804efbc 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 @@ -44,6 +44,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 82 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -60,6 +61,7 @@ other_license_detections: - score: '100.0' start_line: 84 end_line: 84 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -71,6 +73,7 @@ other_license_detections: - score: '100.0' start_line: 85 end_line: 100 + from_file: matched_length: 136 match_coverage: '100.0' matcher: 1-hash @@ -101,6 +104,7 @@ other_license_detections: - score: '100.0' start_line: 103 end_line: 130 + from_file: matched_length: 257 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 132 end_line: 132 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -154,6 +159,7 @@ other_license_detections: - score: '100.0' start_line: 133 end_line: 149 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 1-hash @@ -185,6 +191,7 @@ other_license_detections: - score: '95.0' start_line: 152 end_line: 180 + from_file: matched_length: 265 match_coverage: '100.0' matcher: 1-hash @@ -228,6 +235,7 @@ other_license_detections: - score: '100.0' start_line: 183 end_line: 187 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -247,6 +255,7 @@ other_license_detections: - score: '100.0' start_line: 189 end_line: 189 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -258,6 +267,7 @@ other_license_detections: - score: '100.0' start_line: '190' end_line: 203 + from_file: matched_length: 109 match_coverage: '100.0' matcher: 1-hash 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 0ee04bae69e..812f1337293 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 @@ -18,6 +18,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 48 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash @@ -55,6 +56,7 @@ other_license_detections: - score: '100.0' start_line: 51 end_line: 107 + from_file: matched_length: 356 match_coverage: '100.0' matcher: 1-hash @@ -126,6 +128,7 @@ other_license_detections: - score: '100.0' start_line: 110 end_line: 166 + from_file: matched_length: 357 match_coverage: '100.0' matcher: 1-hash @@ -197,6 +200,7 @@ other_license_detections: - score: '100.0' start_line: 169 end_line: 169 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -208,6 +212,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 188 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho 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 adb6a66a844..33f5fa50772 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 @@ -12,6 +12,7 @@ other_license_detections: - score: '100.0' start_line: 10 end_line: 10 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -23,6 +24,7 @@ other_license_detections: - score: '100.0' start_line: 11 end_line: 16 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -43,6 +45,7 @@ other_license_detections: - score: '100.0' start_line: 21 end_line: 21 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -54,6 +57,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 181 + from_file: matched_length: 1411 match_coverage: '100.0' matcher: 2-aho 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 451c7fde415..f6e3e732fa0 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 @@ -163,6 +163,7 @@ other_license_detections: - score: '99.0' start_line: 355 end_line: 355 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -174,6 +175,7 @@ other_license_detections: - score: '100.0' start_line: 356 end_line: 360 + from_file: matched_length: 43 match_coverage: '100.0' matcher: 1-hash @@ -193,6 +195,7 @@ other_license_detections: - score: '99.93' start_line: 363 end_line: 551 + from_file: matched_length: 1353 match_coverage: '99.93' matcher: 3-seq @@ -396,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 553 end_line: 553 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -407,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 554 end_line: 557 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -422,6 +427,7 @@ other_license_detections: - score: '100.0' start_line: 559 end_line: 560 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -435,6 +441,7 @@ other_license_detections: - score: '100.0' start_line: 560 end_line: 560 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -446,6 +453,7 @@ other_license_detections: - score: '60.0' start_line: 560 end_line: 560 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -460,6 +468,7 @@ other_license_detections: - score: '100.0' start_line: 562 end_line: 562 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -471,6 +480,7 @@ other_license_detections: - score: '100.0' start_line: 563 end_line: 565 + from_file: matched_length: 31 match_coverage: '100.0' matcher: 2-aho @@ -485,6 +495,7 @@ other_license_detections: - score: '100.0' start_line: 567 end_line: 568 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -501,6 +512,7 @@ other_license_detections: - score: '100.0' start_line: 570 end_line: 570 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -512,6 +524,7 @@ other_license_detections: - score: '100.0' start_line: 571 end_line: 574 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -527,6 +540,7 @@ other_license_detections: - score: '100.0' start_line: 576 end_line: 577 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -543,6 +557,7 @@ other_license_detections: - score: '100.0' start_line: 579 end_line: 579 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -554,6 +569,7 @@ other_license_detections: - score: '100.0' start_line: 580 end_line: 582 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 2-aho @@ -568,6 +584,7 @@ other_license_detections: - score: '100.0' start_line: 584 end_line: 585 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -581,6 +598,7 @@ other_license_detections: - score: '100.0' start_line: 585 end_line: 585 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -595,6 +613,7 @@ other_license_detections: - score: '100.0' start_line: 587 end_line: 587 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -606,6 +625,7 @@ other_license_detections: - score: '100.0' start_line: 588 end_line: 591 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -621,6 +641,7 @@ other_license_detections: - score: '100.0' start_line: 593 end_line: 594 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -634,6 +655,7 @@ other_license_detections: - score: '100.0' start_line: 594 end_line: 594 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -648,6 +670,7 @@ other_license_detections: - score: '100.0' start_line: 597 end_line: 607 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 1-hash @@ -673,6 +696,7 @@ other_license_detections: - score: '100.0' start_line: 610 end_line: 612 + from_file: matched_length: 33 match_coverage: '100.0' matcher: 1-hash 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 8ec03add538..7b0ab00bfb9 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 @@ -23,6 +23,7 @@ other_license_detections: - score: '90.0' start_line: 47 end_line: 59 + from_file: matched_length: 101 match_coverage: '100.0' matcher: 1-hash @@ -50,6 +51,7 @@ other_license_detections: - score: '100.0' start_line: 62 end_line: 72 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +77,7 @@ other_license_detections: - score: '100.0' start_line: 75 end_line: 94 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash 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 ea562d6e661..15085390266 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 @@ -49,6 +49,7 @@ other_license_detections: - score: '100.0' start_line: 32 end_line: 35 + from_file: matched_length: 52 match_coverage: '100.0' matcher: 1-hash @@ -67,6 +68,7 @@ other_license_detections: - score: '100.0' start_line: 46 end_line: 47 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -83,6 +85,7 @@ other_license_detections: - score: '100.0' start_line: 121 end_line: 137 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -114,6 +117,7 @@ other_license_detections: - score: '100.0' start_line: 139 end_line: 139 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -125,6 +129,7 @@ other_license_detections: - score: '100.0' start_line: 140 end_line: 152 + from_file: matched_length: 117 match_coverage: '100.0' matcher: 2-aho @@ -149,6 +154,7 @@ other_license_detections: - score: '100.0' start_line: 154 end_line: 154 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -160,6 +166,7 @@ other_license_detections: - score: '100.0' start_line: 155 end_line: 155 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -174,6 +181,7 @@ other_license_detections: - score: '100.0' start_line: 157 end_line: 157 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -185,6 +193,7 @@ other_license_detections: - score: '100.0' start_line: 158 end_line: 171 + from_file: matched_length: 109 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +222,7 @@ other_license_detections: - score: '100.0' start_line: 176 end_line: '198' + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -250,6 +260,7 @@ other_license_detections: - score: '100.0' start_line: 201 end_line: 220 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 1-hash @@ -284,6 +295,7 @@ other_license_detections: - score: '100.0' start_line: 222 end_line: 222 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -295,6 +307,7 @@ other_license_detections: - score: '100.0' start_line: 223 end_line: 235 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -319,6 +332,7 @@ other_license_detections: - score: '100.0' start_line: 237 end_line: 237 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -330,6 +344,7 @@ other_license_detections: - score: '100.0' start_line: 238 end_line: 238 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -344,6 +359,7 @@ other_license_detections: - score: '100.0' start_line: 241 end_line: 273 + from_file: matched_length: 300 match_coverage: '100.0' matcher: 2-aho 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 3fb0fee5f9f..2b1738e7300 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 @@ -30,6 +30,7 @@ other_license_detections: - score: '100.0' start_line: 66 end_line: 66 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -41,6 +42,7 @@ other_license_detections: - score: '100.0' start_line: 67 end_line: 68 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -57,6 +59,7 @@ other_license_detections: - score: '100.0' start_line: 71 end_line: 77 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 1-hash @@ -78,6 +81,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 79 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -89,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 81 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -105,6 +110,7 @@ other_license_detections: - score: '100.0' start_line: 83 end_line: 83 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -116,6 +122,7 @@ other_license_detections: - score: '100.0' start_line: 84 end_line: 85 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +139,7 @@ other_license_detections: - score: '100.0' start_line: 88 end_line: 111 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 1-hash @@ -170,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 114 end_line: 138 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 1-hash 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 6ca09097ea4..2783592c4b5 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 @@ -11,6 +11,7 @@ license_detections: - score: '99.02' start_line: 17 end_line: 30 + from_file: matched_length: 101 match_coverage: '99.02' matcher: 3-seq @@ -33,6 +34,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 45 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -52,6 +54,7 @@ license_detections: - score: '100.0' start_line: 49 end_line: 73 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 2bd991a639c..9902c72cb39 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: '19' + from_file: matched_length: 14 match_coverage: '100.0' matcher: 2-aho @@ -25,6 +26,7 @@ license_detections: - score: '100.0' start_line: 24 end_line: 25 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho 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 2bd991a639c..9902c72cb39 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: '19' + from_file: matched_length: 14 match_coverage: '100.0' matcher: 2-aho @@ -25,6 +26,7 @@ license_detections: - score: '100.0' start_line: 24 end_line: 25 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho 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 63906d93c49..64a07afea06 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: '19' + from_file: matched_length: 42 match_coverage: '100.0' matcher: 2-aho 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 7f2954171d7..b9e5dad7fae 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 14 end_line: 24 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho 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 71be22212c4..652a6d27422 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: 25 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho 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 2ecccab8594..84f89b638fc 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 14 end_line: 38 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 2ecccab8594..84f89b638fc 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 14 end_line: 38 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 e6fbba44e94..986987c4426 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: 39 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 2b2a7e2deb2..13d473614bb 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 @@ -22,6 +22,7 @@ other_license_detections: - score: '100.0' start_line: 38 end_line: 38 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -33,6 +34,7 @@ other_license_detections: - score: '100.0' start_line: 39 end_line: 411 + from_file: matched_length: 2371 match_coverage: '100.0' matcher: 1-hash @@ -420,6 +422,7 @@ other_license_detections: - score: '100.0' start_line: 414 end_line: 441 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -462,6 +465,7 @@ other_license_detections: - score: '99.04' start_line: 446 end_line: 470 + from_file: matched_length: 207 match_coverage: '100.0' matcher: 3-seq @@ -501,6 +505,7 @@ other_license_detections: - score: '100.0' start_line: 472 end_line: 472 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -512,6 +517,7 @@ other_license_detections: - score: '100.0' start_line: 473 end_line: 481 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash 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 d0035c64204..6539f136869 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 @@ -38,6 +38,7 @@ other_license_detections: - score: '100.0' start_line: 93 end_line: 93 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -49,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 94 end_line: 107 + from_file: matched_length: 107 match_coverage: '100.0' matcher: 1-hash @@ -77,6 +79,7 @@ other_license_detections: - score: '100.0' start_line: 109 end_line: 109 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +91,7 @@ other_license_detections: - score: '100.0' start_line: 110 end_line: 124 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -117,6 +121,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 126 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -128,6 +133,7 @@ other_license_detections: - score: '100.0' start_line: 127 end_line: 141 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -157,6 +163,7 @@ other_license_detections: - score: '100.0' start_line: 143 end_line: 143 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -168,6 +175,7 @@ other_license_detections: - score: '100.0' start_line: 144 end_line: 155 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -194,6 +202,7 @@ other_license_detections: - score: '100.0' start_line: 157 end_line: 157 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -205,6 +214,7 @@ other_license_detections: - score: '100.0' start_line: 158 end_line: 179 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -241,6 +251,7 @@ other_license_detections: - score: '97.8' start_line: 182 end_line: 488 + from_file: matched_length: 3074 match_coverage: '97.8' matcher: 3-seq @@ -562,6 +573,7 @@ other_license_detections: - score: '100.0' start_line: 491 end_line: 491 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -573,6 +585,7 @@ other_license_detections: - score: '99.82' start_line: 493 end_line: 914 + from_file: matched_length: 2766 match_coverage: '99.82' matcher: 3-seq 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 77a38d8570d..6f50abdc11b 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 @@ -13,6 +13,7 @@ other_license_detections: - score: '100.0' start_line: 14 end_line: 14 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -24,6 +25,7 @@ other_license_detections: - score: '100.0' start_line: 15 end_line: 28 + from_file: matched_length: 109 match_coverage: '100.0' matcher: 1-hash 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 a1c5a1e3ed6..434eee1d355 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 @@ -19,6 +19,7 @@ other_license_detections: - score: '100.0' start_line: 28 end_line: 35 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 1-hash @@ -41,6 +42,7 @@ other_license_detections: - score: '100.0' start_line: 53 end_line: 53 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -52,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 54 end_line: 69 + from_file: matched_length: 130 match_coverage: '100.0' matcher: 1-hash @@ -82,6 +85,7 @@ other_license_detections: - score: '100.0' start_line: 75 end_line: 83 + from_file: matched_length: 96 match_coverage: '100.0' matcher: 1-hash @@ -105,6 +109,7 @@ other_license_detections: - score: '100.0' start_line: 88 end_line: 88 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -116,6 +121,7 @@ other_license_detections: - score: '100.0' start_line: 89 end_line: 97 + from_file: matched_length: 79 match_coverage: '100.0' matcher: 2-aho @@ -136,6 +142,7 @@ other_license_detections: - score: '100.0' start_line: 99 end_line: 101 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho 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 fe83c031bc5..d5c4247e0b4 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 @@ -34,6 +34,7 @@ other_license_detections: - score: '100.0' start_line: 69 end_line: 69 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -45,6 +46,7 @@ other_license_detections: - score: '100.0' start_line: 70 end_line: 83 + from_file: matched_length: 114 match_coverage: '100.0' matcher: 1-hash @@ -73,6 +75,7 @@ other_license_detections: - score: '100.0' start_line: 85 end_line: 85 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -84,6 +87,7 @@ other_license_detections: - score: '100.0' start_line: 86 end_line: 94 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -104,6 +108,7 @@ other_license_detections: - score: '100.0' start_line: 96 end_line: 96 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -115,6 +120,7 @@ other_license_detections: - score: '100.0' start_line: 97 end_line: 97 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -129,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 100 end_line: 122 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 1-hash @@ -166,6 +173,7 @@ other_license_detections: - score: '100.0' start_line: 125 end_line: 139 + from_file: matched_length: 101 match_coverage: '100.0' matcher: 1-hash @@ -195,6 +203,7 @@ other_license_detections: - score: '100.0' start_line: 141 end_line: 141 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -206,6 +215,7 @@ other_license_detections: - score: '100.0' start_line: 142 end_line: 143 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 1-hash @@ -222,6 +232,7 @@ other_license_detections: - score: '99.82' start_line: 146 end_line: 521 + from_file: matched_length: 3348 match_coverage: '99.82' matcher: 3-seq @@ -612,6 +623,7 @@ other_license_detections: - score: '100.0' start_line: 524 end_line: 566 + from_file: matched_length: 364 match_coverage: '100.0' matcher: 2-aho @@ -666,6 +678,7 @@ other_license_detections: - score: '99.0' start_line: 573 end_line: 614 + from_file: matched_length: 349 match_coverage: '100.0' matcher: 2-aho @@ -722,6 +735,7 @@ other_license_detections: - score: '100.0' start_line: '19' end_line: 21 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -736,6 +750,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 27 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho 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 d6d69a20c70..316a07cc0b6 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 @@ -21,6 +21,7 @@ other_license_detections: - score: '100.0' start_line: 34 end_line: 34 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -32,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 35 end_line: 45 + from_file: matched_length: 91 match_coverage: '100.0' matcher: 1-hash @@ -57,6 +59,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 47 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -68,6 +71,7 @@ other_license_detections: - score: '100.0' start_line: 48 end_line: 58 + from_file: matched_length: 94 match_coverage: '100.0' matcher: 1-hash 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 8a4b63a292f..f985adad9b1 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 @@ -75,6 +75,7 @@ license_detections: - score: '100.0' start_line: 1523 end_line: 1523 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -86,6 +87,7 @@ license_detections: - score: '100.0' start_line: 1524 end_line: 1539 + from_file: matched_length: 136 match_coverage: '100.0' matcher: 1-hash @@ -116,6 +118,7 @@ license_detections: - score: '100.0' start_line: 1541 end_line: 1541 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -127,6 +130,7 @@ license_detections: - score: '100.0' start_line: 1542 end_line: 1557 + from_file: matched_length: 136 match_coverage: '100.0' matcher: 1-hash @@ -157,6 +161,7 @@ license_detections: - score: '100.0' start_line: 1559 end_line: 1559 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -168,6 +173,7 @@ license_detections: - score: '100.0' start_line: 1560 end_line: 1577 + from_file: matched_length: 146 match_coverage: '100.0' matcher: 1-hash @@ -200,6 +206,7 @@ license_detections: - score: '100.0' start_line: 1580 end_line: 1596 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -231,6 +238,7 @@ license_detections: - score: '100.0' start_line: 1599 end_line: 1621 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -268,6 +276,7 @@ license_detections: - score: '100.0' start_line: 1624 end_line: 1649 + from_file: matched_length: 236 match_coverage: '100.0' matcher: 1-hash @@ -308,6 +317,7 @@ license_detections: - score: '100.0' start_line: 1651 end_line: 1651 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -319,6 +329,7 @@ license_detections: - score: '100.0' start_line: 1652 end_line: 1663 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +356,7 @@ license_detections: - score: '100.0' start_line: 1666 end_line: 1669 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -363,6 +375,7 @@ license_detections: - score: '100.0' start_line: 413 end_line: 413 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -377,6 +390,7 @@ license_detections: - score: '91.67' start_line: 562 end_line: 562 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -392,6 +406,7 @@ license_detections: - score: '100.0' start_line: 1099 end_line: 1099 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho 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 052115ffe70..1754e600e8c 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 @@ -93,6 +93,7 @@ license_detections: - score: '100.0' start_line: 173 end_line: 178 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -113,6 +114,7 @@ license_detections: - score: '95.0' start_line: 294 end_line: 298 + from_file: matched_length: 36 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +134,7 @@ license_detections: - score: '100.0' start_line: 309 end_line: 313 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 1-hash @@ -151,6 +154,7 @@ license_detections: - score: '100.0' start_line: 448 end_line: 451 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 1-hash @@ -169,6 +173,7 @@ license_detections: - score: '100.0' start_line: 497 end_line: 497 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -183,6 +188,7 @@ license_detections: - score: '100.0' start_line: 501 end_line: 1350 + from_file: matched_length: 5386 match_coverage: '100.0' matcher: 1-hash @@ -1047,6 +1053,7 @@ license_detections: - score: '100.0' start_line: 1371 end_line: 1373 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -1064,6 +1071,7 @@ license_detections: - score: '100.0' start_line: 1376 end_line: 1398 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -1101,6 +1109,7 @@ license_detections: - score: '100.0' start_line: 1401 end_line: 1423 + from_file: matched_length: 162 match_coverage: '100.0' matcher: 1-hash @@ -1138,6 +1147,7 @@ license_detections: - score: '100.0' start_line: 1426 end_line: 1442 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 1-hash @@ -1169,6 +1179,7 @@ license_detections: - score: '99.0' start_line: 1445 end_line: 1464 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 1-hash @@ -1203,6 +1214,7 @@ license_detections: - score: '100.0' start_line: 1467 end_line: 1471 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 1-hash @@ -1222,6 +1234,7 @@ license_detections: - score: '100.0' start_line: 1474 end_line: 1485 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash @@ -1248,6 +1261,7 @@ license_detections: - score: '100.0' start_line: 1488 end_line: 1519 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1294,6 +1308,7 @@ license_detections: - score: '100.0' start_line: 1522 end_line: 1558 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1345,6 +1360,7 @@ license_detections: - score: '100.0' start_line: 1561 end_line: 1740 + from_file: matched_length: 929 match_coverage: '100.0' matcher: 1-hash @@ -1539,6 +1555,7 @@ license_detections: - score: '100.0' start_line: 1743 end_line: 1762 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -1573,6 +1590,7 @@ license_detections: - score: '100.0' start_line: 1765 end_line: 1779 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 1-hash @@ -1602,6 +1620,7 @@ license_detections: - score: '100.0' start_line: 73 end_line: 73 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1613,6 +1632,7 @@ license_detections: - score: '100.0' start_line: 73 end_line: 73 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1627,6 +1647,7 @@ license_detections: - score: '100.0' start_line: 68 end_line: 72 + from_file: matched_length: 44 match_coverage: '100.0' matcher: 1-hash @@ -1646,6 +1667,7 @@ license_detections: - score: '90.0' start_line: 76 end_line: 76 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1660,6 +1682,7 @@ license_detections: - score: '100.0' start_line: 91 end_line: 91 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1671,6 +1694,7 @@ license_detections: - score: '100.0' start_line: 91 end_line: 91 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1685,6 +1709,7 @@ license_detections: - score: '100.0' start_line: 86 end_line: 90 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -1704,6 +1729,7 @@ license_detections: - score: '100.0' start_line: 96 end_line: 98 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -1721,6 +1747,7 @@ license_detections: - score: '100.0' start_line: 121 end_line: 126 + from_file: matched_length: 49 match_coverage: '100.0' matcher: 1-hash @@ -1741,6 +1768,7 @@ license_detections: - score: '100.0' start_line: 135 end_line: 142 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 1-hash @@ -1763,6 +1791,7 @@ license_detections: - score: '100.0' start_line: 151 end_line: 158 + from_file: matched_length: 53 match_coverage: '100.0' matcher: 1-hash @@ -1785,6 +1814,7 @@ license_detections: - score: '100.0' start_line: 167 end_line: 171 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -1804,6 +1834,7 @@ license_detections: - score: '100.0' start_line: 183 end_line: '190' + from_file: matched_length: 54 match_coverage: '100.0' matcher: 1-hash @@ -1826,6 +1857,7 @@ license_detections: - score: '100.0' start_line: 201 end_line: 208 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 1-hash @@ -1848,6 +1880,7 @@ license_detections: - score: '100.0' start_line: 225 end_line: 234 + from_file: matched_length: 69 match_coverage: '100.0' matcher: 2-aho @@ -1872,6 +1905,7 @@ license_detections: - score: '100.0' start_line: 236 end_line: 236 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1886,6 +1920,7 @@ license_detections: - score: '99.0' start_line: 243 end_line: 251 + from_file: matched_length: 74 match_coverage: '100.0' matcher: 1-hash @@ -1909,6 +1944,7 @@ license_detections: - score: '100.0' start_line: 262 end_line: 265 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -1927,6 +1963,7 @@ license_detections: - score: '100.0' start_line: 320 end_line: 329 + from_file: matched_length: 72 match_coverage: '100.0' matcher: 1-hash @@ -1951,6 +1988,7 @@ license_detections: - score: '100.0' start_line: 338 end_line: 341 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -1969,6 +2007,7 @@ license_detections: - score: '100.0' start_line: 352 end_line: 352 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1980,6 +2019,7 @@ license_detections: - score: '100.0' start_line: 352 end_line: 352 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1994,6 +2034,7 @@ license_detections: - score: '90.0' start_line: 350 end_line: 350 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -2008,6 +2049,7 @@ license_detections: - score: '100.0' start_line: 363 end_line: 367 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -2027,6 +2069,7 @@ license_detections: - score: '100.0' start_line: 375 end_line: 379 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -2046,6 +2089,7 @@ license_detections: - score: '100.0' start_line: 390 end_line: 394 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -2065,6 +2109,7 @@ license_detections: - score: '100.0' start_line: 402 end_line: 406 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -2084,6 +2129,7 @@ license_detections: - score: '100.0' start_line: 412 end_line: 416 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -2103,6 +2149,7 @@ license_detections: - score: '100.0' start_line: 422 end_line: 426 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -2122,6 +2169,7 @@ license_detections: - score: '100.0' start_line: 458 end_line: 465 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 1-hash @@ -2144,6 +2192,7 @@ license_detections: - score: '100.0' start_line: 488 end_line: 492 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash 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 03d4a44578e..9534e3e35ea 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 @@ -11,6 +11,7 @@ license_detections: - score: '100.0' start_line: 45 end_line: 60 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 2-aho @@ -41,6 +42,7 @@ license_detections: - score: '100.0' start_line: 66 end_line: 66 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -55,6 +57,7 @@ license_detections: - score: '100.0' start_line: 74 end_line: 74 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -69,6 +72,7 @@ license_detections: - score: '100.0' start_line: 80 end_line: 82 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -83,6 +87,7 @@ license_detections: - score: '100.0' start_line: 82 end_line: 96 + from_file: matched_length: 108 match_coverage: '100.0' matcher: 2-aho @@ -109,6 +114,7 @@ license_detections: - score: '100.0' start_line: 98 end_line: 98 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -120,6 +126,7 @@ license_detections: - score: '100.0' start_line: 99 end_line: 115 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -148,6 +155,7 @@ license_detections: - score: '100.0' start_line: 117 end_line: 117 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -159,6 +167,7 @@ license_detections: - score: '100.0' start_line: 118 end_line: 129 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho 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 cd109e6e9d6..d5de79eee62 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 @@ -19,6 +19,7 @@ other_license_detections: - score: '100.0' start_line: 27 end_line: 27 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -30,6 +31,7 @@ other_license_detections: - score: '100.0' start_line: 28 end_line: 42 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -59,6 +61,7 @@ other_license_detections: - score: '100.0' start_line: 44 end_line: 44 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -70,6 +73,7 @@ other_license_detections: - score: '100.0' start_line: 45 end_line: 59 + from_file: matched_length: 129 match_coverage: '100.0' matcher: 1-hash 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 6f98d9f0daa..663ac168a7e 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 @@ -21,6 +21,7 @@ other_license_detections: - score: '100.0' start_line: 105 end_line: 105 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -32,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 106 end_line: 114 + from_file: matched_length: 79 match_coverage: '100.0' matcher: 1-hash @@ -52,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 116 end_line: 117 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -68,6 +71,7 @@ other_license_detections: - score: '100.0' start_line: 120 end_line: 136 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -99,6 +103,7 @@ other_license_detections: - score: '100.0' start_line: 138 end_line: 138 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -110,6 +115,7 @@ other_license_detections: - score: '100.0' start_line: 139 end_line: 147 + from_file: matched_length: 81 match_coverage: '100.0' matcher: 1-hash @@ -130,6 +136,7 @@ other_license_detections: - score: '100.0' start_line: 149 end_line: 150 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -146,6 +153,7 @@ other_license_detections: - score: '100.0' start_line: 152 end_line: 152 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -157,6 +165,7 @@ other_license_detections: - score: '100.0' start_line: 153 end_line: 161 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash @@ -177,6 +186,7 @@ other_license_detections: - score: '100.0' start_line: 163 end_line: 164 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash 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 cb73694dd98..87063e959c8 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 @@ -42,6 +42,7 @@ other_license_detections: - score: '99.05' start_line: 85 end_line: 110 + from_file: matched_length: 209 match_coverage: '100.0' matcher: 1-hash @@ -82,6 +83,7 @@ other_license_detections: - score: '100.0' start_line: 114 end_line: 121 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 1-hash @@ -104,6 +106,7 @@ other_license_detections: - score: '90.0' start_line: 129 end_line: 144 + from_file: matched_length: 149 match_coverage: '100.0' matcher: 2-aho @@ -134,6 +137,7 @@ other_license_detections: - score: '100.0' start_line: 147 end_line: 147 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -145,6 +149,7 @@ other_license_detections: - score: '100.0' start_line: 148 end_line: 163 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -175,6 +180,7 @@ other_license_detections: - score: '100.0' start_line: 165 end_line: 165 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -186,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 166 end_line: 181 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -216,6 +223,7 @@ other_license_detections: - score: '100.0' start_line: 183 end_line: 183 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -227,6 +235,7 @@ other_license_detections: - score: '100.0' start_line: 184 end_line: '199' + from_file: matched_length: 135 match_coverage: '100.0' matcher: 1-hash @@ -257,6 +266,7 @@ other_license_detections: - score: '100.0' start_line: 202 end_line: 225 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 1-hash @@ -295,6 +305,7 @@ other_license_detections: - score: '100.0' start_line: 228 end_line: 245 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -327,6 +338,7 @@ other_license_detections: - score: '100.0' start_line: 247 end_line: 247 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -338,6 +350,7 @@ other_license_detections: - score: '100.0' start_line: 248 end_line: 253 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 1-hash @@ -358,6 +371,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 81 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho 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 386433b0f72..2429c8ea9df 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 @@ -44,6 +44,7 @@ other_license_detections: - score: '100.0' start_line: 187 end_line: 188 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 1-hash @@ -60,6 +61,7 @@ other_license_detections: - score: '100.0' start_line: 226 end_line: 250 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 1-hash @@ -99,6 +101,7 @@ other_license_detections: - score: '100.0' start_line: 255 end_line: 279 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -135,6 +138,7 @@ other_license_detections: - score: '95.0' start_line: 281 end_line: 294 + from_file: matched_length: 131 match_coverage: '100.0' matcher: 2-aho @@ -163,6 +167,7 @@ other_license_detections: - score: '100.0' start_line: 296 end_line: 296 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -174,6 +179,7 @@ other_license_detections: - score: '100.0' start_line: 297 end_line: 310 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -202,6 +208,7 @@ other_license_detections: - score: '100.0' start_line: 313 end_line: 329 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -233,6 +240,7 @@ other_license_detections: - score: '100.0' start_line: 336 end_line: 355 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -267,6 +275,7 @@ other_license_detections: - score: '100.0' start_line: 358 end_line: 376 + from_file: matched_length: 153 match_coverage: '100.0' matcher: 1-hash @@ -300,6 +309,7 @@ other_license_detections: - score: '97.85' start_line: 379 end_line: 705 + from_file: matched_length: 2686 match_coverage: '97.85' matcher: 3-seq @@ -641,6 +651,7 @@ other_license_detections: - score: '98.1' start_line: 708 end_line: 731 + from_file: matched_length: 206 match_coverage: '100.0' matcher: 1-hash @@ -679,6 +690,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 174 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -697,6 +709,7 @@ other_license_detections: - score: '100.0' start_line: 209 end_line: 211 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho 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 af8b7f15ed7..98cc55f4673 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 @@ -12,6 +12,7 @@ other_license_detections: - score: '100.0' start_line: 8 end_line: 8 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -23,6 +24,7 @@ other_license_detections: - score: '100.0' start_line: 9 end_line: 15 + from_file: matched_length: 67 match_coverage: '100.0' matcher: 1-hash 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 3ad03f5250e..b8595ebe44c 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 @@ -26,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 91 end_line: 121 + from_file: matched_length: 251 match_coverage: '100.0' matcher: 2-aho @@ -71,6 +72,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 156 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +118,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 187 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -147,6 +150,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: '194' + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -158,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: '195' end_line: 209 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -187,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 211 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +204,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 223 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +228,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 226 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +245,7 @@ other_license_detections: - score: '100.0' start_line: 229 end_line: 265 + from_file: matched_length: 282 match_coverage: '100.0' matcher: 1-hash 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 3ad03f5250e..b8595ebe44c 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 @@ -26,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 91 end_line: 121 + from_file: matched_length: 251 match_coverage: '100.0' matcher: 2-aho @@ -71,6 +72,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 156 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +118,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 187 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -147,6 +150,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: '194' + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -158,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: '195' end_line: 209 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -187,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 211 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +204,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 223 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +228,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 226 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +245,7 @@ other_license_detections: - score: '100.0' start_line: 229 end_line: 265 + from_file: matched_length: 282 match_coverage: '100.0' matcher: 1-hash 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 3ad03f5250e..b8595ebe44c 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 @@ -26,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 91 end_line: 121 + from_file: matched_length: 251 match_coverage: '100.0' matcher: 2-aho @@ -71,6 +72,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 156 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +118,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 187 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -147,6 +150,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: '194' + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -158,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: '195' end_line: 209 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -187,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 211 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +204,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 223 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +228,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 226 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +245,7 @@ other_license_detections: - score: '100.0' start_line: 229 end_line: 265 + from_file: matched_length: 282 match_coverage: '100.0' matcher: 1-hash 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 3ad03f5250e..b8595ebe44c 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 @@ -26,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 91 end_line: 121 + from_file: matched_length: 251 match_coverage: '100.0' matcher: 2-aho @@ -71,6 +72,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 156 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +118,7 @@ other_license_detections: - score: '100.0' start_line: 171 end_line: 187 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -147,6 +150,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: '194' + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -158,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: '195' end_line: 209 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -187,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 211 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +204,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 223 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +228,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 226 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +245,7 @@ other_license_detections: - score: '100.0' start_line: 229 end_line: 265 + from_file: matched_length: 282 match_coverage: '100.0' matcher: 1-hash 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 f30f30627a3..e712753ed8b 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 @@ -19,6 +19,7 @@ other_license_detections: - score: '100.0' start_line: 33 end_line: 54 + from_file: matched_length: 189 match_coverage: '100.0' matcher: 1-hash @@ -55,6 +56,7 @@ other_license_detections: - score: '100.0' start_line: 63 end_line: 77 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -84,6 +86,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 79 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -95,6 +98,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 86 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash 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 fb7b9668ff0..0469276e4c3 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 @@ -14,6 +14,7 @@ other_license_detections: - score: '98.8' start_line: 13 end_line: 53 + from_file: matched_length: 328 match_coverage: '98.8' matcher: 3-seq @@ -69,6 +70,7 @@ other_license_detections: - score: '100.0' start_line: 56 end_line: 57 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash 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 99348988bb5..816baaea077 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: 34 + from_file: matched_length: '199' match_coverage: '100.0' matcher: 2-aho @@ -43,6 +44,7 @@ license_detections: - score: '100.0' start_line: 43 end_line: 62 + from_file: matched_length: '198' match_coverage: '100.0' matcher: 2-aho 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 1084cf20376..4d55cae3b97 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 @@ -152,6 +152,7 @@ other_license_detections: - score: '90.0' start_line: 304 end_line: 305 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -168,6 +169,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 387 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +186,7 @@ other_license_detections: - score: '100.0' start_line: 505 end_line: 519 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +216,7 @@ other_license_detections: - score: '100.0' start_line: 562 end_line: 588 + from_file: matched_length: 216 match_coverage: '100.0' matcher: 1-hash @@ -254,6 +258,7 @@ other_license_detections: - score: '100.0' start_line: 597 end_line: 621 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -293,6 +298,7 @@ other_license_detections: - score: '100.0' start_line: 734 end_line: 741 + from_file: matched_length: 76 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +321,7 @@ other_license_detections: - score: '100.0' start_line: 807 end_line: 827 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 2-aho @@ -347,6 +354,7 @@ other_license_detections: - score: '100.0' start_line: 829 end_line: 829 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -361,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 850 end_line: 850 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -372,6 +381,7 @@ other_license_detections: - score: '100.0' start_line: 851 end_line: 865 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 1-hash @@ -401,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 867 end_line: 867 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -412,6 +423,7 @@ other_license_detections: - score: '100.0' start_line: 868 end_line: 883 + from_file: matched_length: 129 match_coverage: '100.0' matcher: 1-hash @@ -442,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 885 end_line: 885 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -453,6 +466,7 @@ other_license_detections: - score: '100.0' start_line: 886 end_line: 902 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 1-hash @@ -484,6 +498,7 @@ other_license_detections: - score: '100.0' start_line: 904 end_line: 904 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -495,6 +510,7 @@ other_license_detections: - score: '100.0' start_line: 905 end_line: 922 + from_file: matched_length: 136 match_coverage: '100.0' matcher: 1-hash @@ -527,6 +543,7 @@ other_license_detections: - score: '53.47' start_line: 925 end_line: 934 + from_file: matched_length: 60 match_coverage: '59.41' matcher: 3-seq @@ -551,6 +568,7 @@ other_license_detections: - score: '100.0' start_line: 937 end_line: 959 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -588,6 +606,7 @@ other_license_detections: - score: '99.0' start_line: 961 end_line: 961 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -599,6 +618,7 @@ other_license_detections: - score: '100.0' start_line: 962 end_line: 1088 + from_file: matched_length: 960 match_coverage: '100.0' matcher: 1-hash @@ -740,6 +760,7 @@ other_license_detections: - score: '100.0' start_line: 1091 end_line: 1091 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -754,6 +775,7 @@ other_license_detections: - score: '100.0' start_line: 1093 end_line: 1093 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -765,6 +787,7 @@ other_license_detections: - score: '100.0' start_line: 1094 end_line: 1108 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -794,6 +817,7 @@ other_license_detections: - score: '100.0' start_line: 1110 end_line: 1110 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -805,6 +829,7 @@ other_license_detections: - score: '100.0' start_line: 1111 end_line: 1124 + from_file: matched_length: 116 match_coverage: '100.0' matcher: 1-hash @@ -833,6 +858,7 @@ other_license_detections: - score: '100.0' start_line: 201 end_line: 210 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 1-hash 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 9c28d7f9e57..589d66462d7 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 @@ -42,6 +42,7 @@ other_license_detections: - score: '100.0' start_line: 92 end_line: 92 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -53,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 94 end_line: 112 + from_file: matched_length: 158 match_coverage: '100.0' matcher: 2-aho @@ -86,6 +88,7 @@ other_license_detections: - score: '100.0' start_line: 115 end_line: 135 + from_file: matched_length: 202 match_coverage: '100.0' matcher: 1-hash @@ -121,6 +124,7 @@ other_license_detections: - score: '100.0' start_line: 138 end_line: 154 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -152,6 +156,7 @@ other_license_detections: - score: '100.0' start_line: 157 end_line: 172 + from_file: matched_length: 153 match_coverage: '100.0' matcher: 2-aho @@ -179,6 +184,7 @@ other_license_detections: - score: '100.0' start_line: 179 end_line: 185 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -200,6 +206,7 @@ other_license_detections: - score: '100.0' start_line: 188 end_line: '194' + from_file: matched_length: 36 match_coverage: '100.0' matcher: 1-hash @@ -221,6 +228,7 @@ other_license_detections: - score: '100.0' start_line: '197' end_line: 209 + from_file: matched_length: 122 match_coverage: '100.0' matcher: 1-hash @@ -248,6 +256,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 211 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -259,6 +268,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 231 + from_file: matched_length: 139 match_coverage: '100.0' matcher: 1-hash 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 cd1f2464137..67f24841cca 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 23 end_line: 45 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 2-aho @@ -47,6 +48,7 @@ license_detections: - score: '100.0' start_line: 50 end_line: 70 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 2-aho @@ -82,6 +84,7 @@ license_detections: - score: '100.0' start_line: 76 end_line: 98 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -119,6 +122,7 @@ license_detections: - score: '100.0' start_line: 105 end_line: 127 + from_file: matched_length: '199' match_coverage: '100.0' matcher: 2-aho 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 7de3bd3d656..b8041c065bf 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 @@ -21,6 +21,7 @@ other_license_detections: - score: '100.0' start_line: 30 end_line: 46 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -52,6 +53,7 @@ other_license_detections: - score: '100.0' start_line: 49 end_line: 70 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +90,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 72 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -99,6 +102,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 78 + from_file: matched_length: 59 match_coverage: '100.0' matcher: 1-hash @@ -119,6 +123,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 80 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -130,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 87 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 1-hash 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 4d18e0ff430..a54cf257f9f 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 @@ -46,6 +46,7 @@ other_license_detections: - score: '90.0' start_line: 162 end_line: 175 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -74,6 +75,7 @@ other_license_detections: - score: '100.0' start_line: 178 end_line: '199' + from_file: matched_length: 201 match_coverage: '100.0' matcher: 1-hash @@ -110,6 +112,7 @@ other_license_detections: - score: '100.0' start_line: 202 end_line: 222 + from_file: matched_length: 202 match_coverage: '100.0' matcher: 1-hash @@ -145,6 +148,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 247 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 1-hash @@ -182,6 +186,7 @@ other_license_detections: - score: '100.0' start_line: 250 end_line: 250 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -193,6 +198,7 @@ other_license_detections: - score: '100.0' start_line: 252 end_line: 268 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -224,6 +230,7 @@ other_license_detections: - score: '100.0' start_line: 270 end_line: 270 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +242,7 @@ other_license_detections: - score: '100.0' start_line: 271 end_line: 283 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -259,6 +267,7 @@ other_license_detections: - score: '100.0' start_line: 285 end_line: 286 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -275,6 +284,7 @@ other_license_detections: - score: '100.0' start_line: 288 end_line: 288 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -286,6 +296,7 @@ other_license_detections: - score: '100.0' start_line: 289 end_line: 303 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +326,7 @@ other_license_detections: - score: '100.0' start_line: 305 end_line: 305 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +338,7 @@ other_license_detections: - score: '100.0' start_line: 306 end_line: 314 + from_file: matched_length: 91 match_coverage: '100.0' matcher: 1-hash @@ -349,6 +362,7 @@ other_license_detections: - score: '100.0' start_line: 316 end_line: 316 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -360,6 +374,7 @@ other_license_detections: - score: '100.0' start_line: 317 end_line: 332 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 1-hash @@ -390,6 +405,7 @@ other_license_detections: - score: '100.0' start_line: 335 end_line: 337 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 1-hash 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 03e290c0a53..32b70aba701 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 @@ -40,6 +40,7 @@ other_license_detections: - score: '100.0' start_line: 110 end_line: 130 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -75,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 135 end_line: 157 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -112,6 +114,7 @@ other_license_detections: - score: '100.0' start_line: 160 end_line: 182 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -149,6 +152,7 @@ other_license_detections: - score: '100.0' start_line: 185 end_line: 201 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 77b79a58f2d..148263664c7 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 @@ -20,6 +20,7 @@ other_license_detections: - score: '99.53' start_line: 26 end_line: 45 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 1-hash @@ -54,6 +55,7 @@ other_license_detections: - score: '100.0' start_line: 48 end_line: 67 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +90,7 @@ other_license_detections: - score: '100.0' start_line: 71 end_line: 71 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -99,6 +102,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 86 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -128,6 +132,7 @@ other_license_detections: - score: '100.0' start_line: 89 end_line: 89 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash 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 731069cf27d..461900f837c 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 @@ -12,6 +12,7 @@ other_license_detections: - score: '100.0' start_line: 12 end_line: 12 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -23,6 +24,7 @@ other_license_detections: - score: '100.0' start_line: 13 end_line: 24 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -46,6 +48,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 26 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -57,6 +60,7 @@ other_license_detections: - score: '100.0' start_line: 27 end_line: 27 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho 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 e8c25f5cdc6..7c035acfee7 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 @@ -25,6 +25,7 @@ other_license_detections: - score: '100.0' start_line: 38 end_line: 61 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -56,6 +57,7 @@ other_license_detections: - score: '100.0' start_line: 63 end_line: 63 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -67,6 +69,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 74 + from_file: matched_length: 94 match_coverage: '100.0' matcher: 2-aho @@ -89,6 +92,7 @@ other_license_detections: - score: '100.0' start_line: 76 end_line: 77 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -105,6 +109,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 79 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -116,6 +121,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 94 + from_file: matched_length: 122 match_coverage: '100.0' matcher: 1-hash @@ -145,6 +151,7 @@ other_license_detections: - score: '100.0' start_line: 96 end_line: 96 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -156,6 +163,7 @@ other_license_detections: - score: '100.0' start_line: 97 end_line: 110 + from_file: matched_length: 120 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 113 end_line: 123 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -206,6 +215,7 @@ other_license_detections: - score: '100.0' start_line: 127 end_line: 145 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -239,6 +249,7 @@ other_license_detections: - score: '100.0' start_line: 148 end_line: 169 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 1-hash 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 f6fbcbf96c6..8c5e79d60a2 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 @@ -16,6 +16,7 @@ license_detections: - score: '100.0' start_line: 17 end_line: 37 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 2-aho @@ -48,6 +49,7 @@ license_detections: - score: '100.0' start_line: 41 end_line: 81 + from_file: matched_length: 297 match_coverage: '100.0' matcher: 2-aho @@ -103,6 +105,7 @@ license_detections: - score: '100.0' start_line: 91 end_line: 107 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -134,6 +137,7 @@ license_detections: - score: '100.0' start_line: 115 end_line: 122 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho @@ -156,6 +160,7 @@ license_detections: - score: '95.0' start_line: 129 end_line: 145 + from_file: matched_length: 123 match_coverage: '100.0' matcher: 2-aho @@ -187,6 +192,7 @@ license_detections: - score: '100.0' start_line: 154 end_line: 173 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +227,7 @@ license_detections: - score: '100.0' start_line: 180 end_line: 206 + from_file: matched_length: 221 match_coverage: '100.0' matcher: 2-aho @@ -253,6 +260,7 @@ license_detections: - score: '100.0' start_line: 227 end_line: 238 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -279,6 +287,7 @@ license_detections: - score: '100.0' start_line: 245 end_line: 250 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -296,6 +305,7 @@ license_detections: - score: '100.0' start_line: 277 end_line: 283 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -314,6 +324,7 @@ license_detections: - score: '100.0' start_line: 311 end_line: 319 + from_file: matched_length: 96 match_coverage: '100.0' matcher: 2-aho @@ -337,6 +348,7 @@ license_detections: - score: '100.0' start_line: 327 end_line: 328 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -353,6 +365,7 @@ license_detections: - score: '95.0' start_line: 337 end_line: 352 + from_file: matched_length: 123 match_coverage: '100.0' matcher: 2-aho @@ -383,6 +396,7 @@ license_detections: - score: '100.0' start_line: 359 end_line: 362 + from_file: matched_length: 43 match_coverage: '100.0' matcher: 2-aho @@ -401,6 +415,7 @@ license_detections: - score: '100.0' start_line: 368 end_line: 378 + from_file: matched_length: 101 match_coverage: '100.0' matcher: 2-aho @@ -423,6 +438,7 @@ license_detections: - score: '100.0' start_line: 380 end_line: 381 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -439,6 +455,7 @@ license_detections: - score: '100.0' start_line: 388 end_line: 414 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -477,6 +494,7 @@ license_detections: - score: '100.0' start_line: 416 end_line: 419 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -495,6 +513,7 @@ license_detections: - score: '99.0' start_line: 426 end_line: 431 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho 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 47ad9bef08b..ae8d9618560 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 @@ -15,6 +15,7 @@ other_license_detections: - score: '100.0' start_line: 15 end_line: 15 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -26,6 +27,7 @@ other_license_detections: - score: '100.0' start_line: 16 end_line: 30 + from_file: matched_length: 130 match_coverage: '100.0' matcher: 1-hash @@ -55,6 +57,7 @@ other_license_detections: - score: '100.0' start_line: 32 end_line: 32 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -66,6 +69,7 @@ other_license_detections: - score: '100.0' start_line: 33 end_line: 47 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash 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 e5c8a2f0f0d..cc237107a7c 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 @@ -24,6 +24,7 @@ other_license_detections: - score: '100.0' start_line: 27 end_line: 29 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -41,6 +42,7 @@ other_license_detections: - score: '100.0' start_line: 39 end_line: 51 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 1-hash @@ -68,6 +70,7 @@ other_license_detections: - score: '100.0' start_line: 54 end_line: 54 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -79,6 +82,7 @@ other_license_detections: - score: '100.0' start_line: 55 end_line: 61 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 1-hash @@ -100,6 +104,7 @@ other_license_detections: - score: '100.0' start_line: 63 end_line: 63 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -111,6 +116,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 70 + from_file: matched_length: 68 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +138,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 95 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash 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 c0092f25c7c..b30cecc76eb 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 @@ -35,6 +35,7 @@ other_license_detections: - score: '100.0' start_line: 85 end_line: 87 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 1-hash @@ -52,6 +53,7 @@ other_license_detections: - score: '100.0' start_line: 90 end_line: 116 + from_file: matched_length: 241 match_coverage: '100.0' matcher: 1-hash @@ -93,6 +95,7 @@ other_license_detections: - score: '100.0' start_line: 118 end_line: 118 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -104,6 +107,7 @@ other_license_detections: - score: '100.0' start_line: 119 end_line: 130 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -130,6 +134,7 @@ other_license_detections: - score: '100.0' start_line: 133 end_line: 171 + from_file: matched_length: 341 match_coverage: '100.0' matcher: 1-hash @@ -183,6 +188,7 @@ other_license_detections: - score: '100.0' start_line: 174 end_line: 224 + from_file: matched_length: 423 match_coverage: '100.0' matcher: 1-hash 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 90b89f0ee81..f14760fe5cf 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 @@ -742,6 +742,7 @@ other_license_detections: - score: '100.0' start_line: 2100 end_line: 2100 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -753,6 +754,7 @@ other_license_detections: - score: '100.0' start_line: 2101 end_line: 2102 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 1-hash @@ -769,6 +771,7 @@ other_license_detections: - score: '100.0' start_line: 2104 end_line: 2104 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -780,6 +783,7 @@ other_license_detections: - score: '100.0' start_line: 2105 end_line: 2106 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -796,6 +800,7 @@ other_license_detections: - score: '100.0' start_line: 2108 end_line: 2108 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -807,6 +812,7 @@ other_license_detections: - score: '100.0' start_line: 2109 end_line: 2111 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 1-hash @@ -824,6 +830,7 @@ other_license_detections: - score: '99.0' start_line: 2113 end_line: 2113 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -835,6 +842,7 @@ other_license_detections: - score: '100.0' start_line: 2114 end_line: 2115 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -851,6 +859,7 @@ other_license_detections: - score: '100.0' start_line: 2118 end_line: 2299 + from_file: matched_length: 1354 match_coverage: '100.0' matcher: 1-hash @@ -1047,6 +1056,7 @@ other_license_detections: - score: '100.0' start_line: 2302 end_line: 2331 + from_file: matched_length: 233 match_coverage: '100.0' matcher: 2-aho @@ -1091,6 +1101,7 @@ other_license_detections: - score: '100.0' start_line: 2337 end_line: 2351 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -1120,6 +1131,7 @@ other_license_detections: - score: '100.0' start_line: 2354 end_line: 2370 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -1151,6 +1163,7 @@ other_license_detections: - score: '100.0' start_line: 2373 end_line: 2395 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1188,6 +1201,7 @@ other_license_detections: - score: '98.25' start_line: 2398 end_line: 2424 + from_file: matched_length: 224 match_coverage: '100.0' matcher: 1-hash @@ -1229,6 +1243,7 @@ other_license_detections: - score: '99.57' start_line: 2428 end_line: 2482 + from_file: matched_length: 468 match_coverage: '99.57' matcher: 3-seq @@ -1298,6 +1313,7 @@ other_license_detections: - score: '100.0' start_line: 2485 end_line: 2507 + from_file: matched_length: 207 match_coverage: '100.0' matcher: 1-hash @@ -1335,6 +1351,7 @@ other_license_detections: - score: '100.0' start_line: 2510 end_line: 2532 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1372,6 +1389,7 @@ other_license_detections: - score: '100.0' start_line: 2535 end_line: 2547 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 1-hash @@ -1399,6 +1417,7 @@ other_license_detections: - score: '100.0' start_line: 2550 end_line: 2554 + from_file: matched_length: 43 match_coverage: '100.0' matcher: 1-hash @@ -1418,6 +1437,7 @@ other_license_detections: - score: '100.0' start_line: 2557 end_line: 2559 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 1-hash @@ -1435,6 +1455,7 @@ other_license_detections: - score: '90.0' start_line: 2562 end_line: 2563 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -1451,6 +1472,7 @@ other_license_detections: - score: '100.0' start_line: 2569 end_line: 2569 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1462,6 +1484,7 @@ other_license_detections: - score: '100.0' start_line: 2574 end_line: 2574 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1473,6 +1496,7 @@ other_license_detections: - score: '70.0' start_line: 2575 end_line: 2575 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1484,6 +1508,7 @@ other_license_detections: - score: '70.0' start_line: 2584 end_line: 2584 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1498,6 +1523,7 @@ other_license_detections: - score: '100.0' start_line: 2588 end_line: 2612 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -1537,6 +1563,7 @@ other_license_detections: - score: '100.0' start_line: 2615 end_line: 2630 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 1-hash @@ -1567,6 +1594,7 @@ other_license_detections: - score: '99.0' start_line: 2636 end_line: 2661 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -1607,6 +1635,7 @@ other_license_detections: - score: '100.0' start_line: 2663 end_line: 2663 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -1618,6 +1647,7 @@ other_license_detections: - score: '100.0' start_line: 2664 end_line: 2783 + from_file: matched_length: 981 match_coverage: '100.0' matcher: 1-hash @@ -1752,6 +1782,7 @@ other_license_detections: - score: '100.0' start_line: 2790 end_line: 2793 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 1-hash @@ -1770,6 +1801,7 @@ other_license_detections: - score: '100.0' start_line: 2796 end_line: 2920 + from_file: matched_length: 947 match_coverage: '100.0' matcher: 1-hash @@ -1909,6 +1941,7 @@ other_license_detections: - score: '100.0' start_line: 20 end_line: 27 + from_file: matched_length: 49 match_coverage: '100.0' matcher: 2-aho @@ -1931,6 +1964,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 47 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1945,6 +1979,7 @@ other_license_detections: - score: '100.0' start_line: 54 end_line: 54 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1959,6 +1994,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 64 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1973,6 +2009,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 72 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1987,6 +2024,7 @@ other_license_detections: - score: '100.0' start_line: 82 end_line: 82 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -2001,6 +2039,7 @@ other_license_detections: - score: '100.0' start_line: 113 end_line: 114 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -2017,6 +2056,7 @@ other_license_detections: - score: '100.0' start_line: 126 end_line: 127 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2033,6 +2073,7 @@ other_license_detections: - score: '100.0' start_line: 136 end_line: 136 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -2047,6 +2088,7 @@ other_license_detections: - score: '100.0' start_line: 146 end_line: 148 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -2064,6 +2106,7 @@ other_license_detections: - score: '100.0' start_line: 154 end_line: 155 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2080,6 +2123,7 @@ other_license_detections: - score: '100.0' start_line: 162 end_line: 163 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2096,6 +2140,7 @@ other_license_detections: - score: '100.0' start_line: 170 end_line: 170 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2110,6 +2155,7 @@ other_license_detections: - score: '90.91' start_line: 177 end_line: 177 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -2124,6 +2170,7 @@ other_license_detections: - score: '91.67' start_line: 185 end_line: 185 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2138,6 +2185,7 @@ other_license_detections: - score: '100.0' start_line: '195' end_line: '196' + from_file: matched_length: 15 match_coverage: '100.0' matcher: 2-aho @@ -2154,6 +2202,7 @@ other_license_detections: - score: '100.0' start_line: 202 end_line: 203 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2170,6 +2219,7 @@ other_license_detections: - score: '100.0' start_line: 212 end_line: 213 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2186,6 +2236,7 @@ other_license_detections: - score: '100.0' start_line: 220 end_line: 221 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2202,6 +2253,7 @@ other_license_detections: - score: '100.0' start_line: 228 end_line: 229 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2218,6 +2270,7 @@ other_license_detections: - score: '100.0' start_line: 236 end_line: 237 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2234,6 +2287,7 @@ other_license_detections: - score: '100.0' start_line: 246 end_line: 247 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2250,6 +2304,7 @@ other_license_detections: - score: '100.0' start_line: 258 end_line: 258 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -2264,6 +2319,7 @@ other_license_detections: - score: '100.0' start_line: 264 end_line: 265 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2280,6 +2336,7 @@ other_license_detections: - score: '100.0' start_line: 278 end_line: 278 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -2294,6 +2351,7 @@ other_license_detections: - score: '100.0' start_line: 284 end_line: 285 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 1-hash @@ -2310,6 +2368,7 @@ other_license_detections: - score: '100.0' start_line: 293 end_line: 295 + from_file: matched_length: 31 match_coverage: '100.0' matcher: 1-hash @@ -2327,6 +2386,7 @@ other_license_detections: - score: '100.0' start_line: 303 end_line: 304 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 1-hash @@ -2343,6 +2403,7 @@ other_license_detections: - score: '100.0' start_line: 312 end_line: 319 + from_file: matched_length: 50 match_coverage: '100.0' matcher: 1-hash @@ -2365,6 +2426,7 @@ other_license_detections: - score: '100.0' start_line: 325 end_line: 326 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2381,6 +2443,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2397,6 +2460,7 @@ other_license_detections: - score: '100.0' start_line: 358 end_line: 359 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2413,6 +2477,7 @@ other_license_detections: - score: '100.0' start_line: 365 end_line: 366 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2429,6 +2494,7 @@ other_license_detections: - score: '100.0' start_line: 374 end_line: 374 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2443,6 +2509,7 @@ other_license_detections: - score: '100.0' start_line: 382 end_line: 383 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2459,6 +2526,7 @@ other_license_detections: - score: '100.0' start_line: 394 end_line: 395 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2475,6 +2543,7 @@ other_license_detections: - score: '100.0' start_line: 402 end_line: 403 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2491,6 +2560,7 @@ other_license_detections: - score: '100.0' start_line: 410 end_line: 411 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2507,6 +2577,7 @@ other_license_detections: - score: '100.0' start_line: 417 end_line: 418 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2523,6 +2594,7 @@ other_license_detections: - score: '100.0' start_line: 427 end_line: 428 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2539,6 +2611,7 @@ other_license_detections: - score: '100.0' start_line: 435 end_line: 436 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2555,6 +2628,7 @@ other_license_detections: - score: '100.0' start_line: 444 end_line: 445 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2571,6 +2645,7 @@ other_license_detections: - score: '100.0' start_line: 454 end_line: 455 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2587,6 +2662,7 @@ other_license_detections: - score: '100.0' start_line: 462 end_line: 463 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2603,6 +2679,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 470 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2619,6 +2696,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 477 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2635,6 +2713,7 @@ other_license_detections: - score: '100.0' start_line: 484 end_line: 485 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2651,6 +2730,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 493 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2667,6 +2747,7 @@ other_license_detections: - score: '100.0' start_line: 500 end_line: 509 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 2-aho @@ -2691,6 +2772,7 @@ other_license_detections: - score: '100.0' start_line: 517 end_line: 518 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2707,6 +2789,7 @@ other_license_detections: - score: '100.0' start_line: 524 end_line: 525 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2723,6 +2806,7 @@ other_license_detections: - score: '100.0' start_line: 540 end_line: 541 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2739,6 +2823,7 @@ other_license_detections: - score: '100.0' start_line: 549 end_line: 550 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2755,6 +2840,7 @@ other_license_detections: - score: '100.0' start_line: 558 end_line: 559 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2771,6 +2857,7 @@ other_license_detections: - score: '100.0' start_line: 568 end_line: 569 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2787,6 +2874,7 @@ other_license_detections: - score: '100.0' start_line: 576 end_line: 580 + from_file: matched_length: 47 match_coverage: '100.0' matcher: 1-hash @@ -2806,6 +2894,7 @@ other_license_detections: - score: '100.0' start_line: 587 end_line: 588 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2822,6 +2911,7 @@ other_license_detections: - score: '100.0' start_line: 595 end_line: 596 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2838,6 +2928,7 @@ other_license_detections: - score: '100.0' start_line: 603 end_line: 604 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2854,6 +2945,7 @@ other_license_detections: - score: '100.0' start_line: 613 end_line: 614 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2870,6 +2962,7 @@ other_license_detections: - score: '100.0' start_line: 621 end_line: 622 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2886,6 +2979,7 @@ other_license_detections: - score: '100.0' start_line: 630 end_line: 631 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2902,6 +2996,7 @@ other_license_detections: - score: '100.0' start_line: 638 end_line: 639 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2918,6 +3013,7 @@ other_license_detections: - score: '100.0' start_line: 646 end_line: 647 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2934,6 +3030,7 @@ other_license_detections: - score: '100.0' start_line: 657 end_line: 658 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2950,6 +3047,7 @@ other_license_detections: - score: '100.0' start_line: 664 end_line: 665 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2966,6 +3064,7 @@ other_license_detections: - score: '100.0' start_line: 676 end_line: 677 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2982,6 +3081,7 @@ other_license_detections: - score: '100.0' start_line: 684 end_line: 686 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -2999,6 +3099,7 @@ other_license_detections: - score: '99.0' start_line: 700 end_line: 701 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -3015,6 +3116,7 @@ other_license_detections: - score: '100.0' start_line: 707 end_line: 708 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3031,6 +3133,7 @@ other_license_detections: - score: '100.0' start_line: 715 end_line: 719 + from_file: matched_length: 34 match_coverage: '100.0' matcher: 2-aho @@ -3050,6 +3153,7 @@ other_license_detections: - score: '100.0' start_line: 727 end_line: 728 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3066,6 +3170,7 @@ other_license_detections: - score: '100.0' start_line: 736 end_line: 737 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -3079,6 +3184,7 @@ other_license_detections: - score: '100.0' start_line: 744 end_line: 753 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -3103,6 +3209,7 @@ other_license_detections: - score: '100.0' start_line: 761 end_line: 762 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3119,6 +3226,7 @@ other_license_detections: - score: '100.0' start_line: 769 end_line: 770 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3135,6 +3243,7 @@ other_license_detections: - score: '100.0' start_line: 777 end_line: 777 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -3149,6 +3258,7 @@ other_license_detections: - score: '100.0' start_line: 784 end_line: 785 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3165,6 +3275,7 @@ other_license_detections: - score: '100.0' start_line: 792 end_line: 793 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3181,6 +3292,7 @@ other_license_detections: - score: '100.0' start_line: 800 end_line: 801 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3197,6 +3309,7 @@ other_license_detections: - score: '100.0' start_line: 808 end_line: 810 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -3214,6 +3327,7 @@ other_license_detections: - score: '100.0' start_line: 817 end_line: 818 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3230,6 +3344,7 @@ other_license_detections: - score: '100.0' start_line: 827 end_line: 828 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3246,6 +3361,7 @@ other_license_detections: - score: '100.0' start_line: 836 end_line: 837 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3262,6 +3378,7 @@ other_license_detections: - score: '100.0' start_line: 868 end_line: 869 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3278,6 +3395,7 @@ other_license_detections: - score: '100.0' start_line: 882 end_line: 883 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -3294,6 +3412,7 @@ other_license_detections: - score: '100.0' start_line: 890 end_line: 891 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3310,6 +3429,7 @@ other_license_detections: - score: '100.0' start_line: 898 end_line: 900 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -3327,6 +3447,7 @@ other_license_detections: - score: '56.14' start_line: 908 end_line: 909 + from_file: matched_length: 13 match_coverage: '59.09' matcher: 3-seq @@ -3343,6 +3464,7 @@ other_license_detections: - score: '100.0' start_line: 916 end_line: 917 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3359,6 +3481,7 @@ other_license_detections: - score: '100.0' start_line: 924 end_line: 925 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3375,6 +3498,7 @@ other_license_detections: - score: '100.0' start_line: 939 end_line: 943 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 2-aho @@ -3391,6 +3515,7 @@ other_license_detections: - score: '100.0' start_line: 946 end_line: 950 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -3407,6 +3532,7 @@ other_license_detections: - score: '100.0' start_line: 954 end_line: 956 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -3424,6 +3550,7 @@ other_license_detections: - score: '100.0' start_line: 964 end_line: 966 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -3441,6 +3568,7 @@ other_license_detections: - score: '100.0' start_line: 973 end_line: 974 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3457,6 +3585,7 @@ other_license_detections: - score: '100.0' start_line: 981 end_line: 982 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3473,6 +3602,7 @@ other_license_detections: - score: '100.0' start_line: 998 end_line: 999 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3489,6 +3619,7 @@ other_license_detections: - score: '100.0' start_line: 1017 end_line: 1018 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -3505,6 +3636,7 @@ other_license_detections: - score: '100.0' start_line: 1025 end_line: 1026 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3521,6 +3653,7 @@ other_license_detections: - score: '100.0' start_line: 1033 end_line: 1034 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3537,6 +3670,7 @@ other_license_detections: - score: '100.0' start_line: 1042 end_line: 1043 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3553,6 +3687,7 @@ other_license_detections: - score: '100.0' start_line: 1051 end_line: 1052 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3569,6 +3704,7 @@ other_license_detections: - score: '100.0' start_line: 1060 end_line: 1061 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3585,6 +3721,7 @@ other_license_detections: - score: '100.0' start_line: 1068 end_line: 1069 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3601,6 +3738,7 @@ other_license_detections: - score: '100.0' start_line: 1084 end_line: 1085 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3617,6 +3755,7 @@ other_license_detections: - score: '100.0' start_line: 1092 end_line: 1093 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -3630,6 +3769,7 @@ other_license_detections: - score: '100.0' start_line: 1095 end_line: 1099 + from_file: matched_length: 53 match_coverage: '100.0' matcher: 2-aho @@ -3649,6 +3789,7 @@ other_license_detections: - score: '100.0' start_line: 1107 end_line: 1108 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3665,6 +3806,7 @@ other_license_detections: - score: '100.0' start_line: 1114 end_line: 1115 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3681,6 +3823,7 @@ other_license_detections: - score: '100.0' start_line: 1126 end_line: 1128 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -3698,6 +3841,7 @@ other_license_detections: - score: '100.0' start_line: 1136 end_line: 1137 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3714,6 +3858,7 @@ other_license_detections: - score: '99.0' start_line: 1144 end_line: 1147 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -3732,6 +3877,7 @@ other_license_detections: - score: '100.0' start_line: 1161 end_line: 1167 + from_file: matched_length: 61 match_coverage: '100.0' matcher: 1-hash @@ -3753,6 +3899,7 @@ other_license_detections: - score: '100.0' start_line: 1181 end_line: 1185 + from_file: matched_length: 33 match_coverage: '100.0' matcher: 1-hash @@ -3772,6 +3919,7 @@ other_license_detections: - score: '100.0' start_line: 1192 end_line: 1193 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3788,6 +3936,7 @@ other_license_detections: - score: '100.0' start_line: 1199 end_line: 1200 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -3804,6 +3953,7 @@ other_license_detections: - score: '99.0' start_line: 1209 end_line: 1209 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -3815,6 +3965,7 @@ other_license_detections: - score: '70.0' start_line: 1210 end_line: 1211 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -3831,6 +3982,7 @@ other_license_detections: - score: '100.0' start_line: 1219 end_line: 1220 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3847,6 +3999,7 @@ other_license_detections: - score: '100.0' start_line: 1227 end_line: 1227 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -3861,6 +4014,7 @@ other_license_detections: - score: '100.0' start_line: 1237 end_line: 1238 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3877,6 +4031,7 @@ other_license_detections: - score: '100.0' start_line: 1249 end_line: 1253 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 2-aho @@ -3896,6 +4051,7 @@ other_license_detections: - score: '100.0' start_line: 1263 end_line: 1264 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3912,6 +4068,7 @@ other_license_detections: - score: '99.0' start_line: 1300 end_line: 1301 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3928,6 +4085,7 @@ other_license_detections: - score: '100.0' start_line: 1309 end_line: 1310 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -3944,6 +4102,7 @@ other_license_detections: - score: '100.0' start_line: 1318 end_line: 1319 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3960,6 +4119,7 @@ other_license_detections: - score: '100.0' start_line: 1326 end_line: 1327 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3976,6 +4136,7 @@ other_license_detections: - score: '100.0' start_line: 1335 end_line: 1336 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3992,6 +4153,7 @@ other_license_detections: - score: '100.0' start_line: 1344 end_line: 1345 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -4005,6 +4167,7 @@ other_license_detections: - score: '100.0' start_line: 1347 end_line: 1348 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -4021,6 +4184,7 @@ other_license_detections: - score: '100.0' start_line: 1355 end_line: 1356 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4037,6 +4201,7 @@ other_license_detections: - score: '100.0' start_line: 1362 end_line: 1363 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -4053,6 +4218,7 @@ other_license_detections: - score: '100.0' start_line: 1371 end_line: 1372 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4069,6 +4235,7 @@ other_license_detections: - score: '100.0' start_line: 1379 end_line: 1380 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -4085,6 +4252,7 @@ other_license_detections: - score: '100.0' start_line: 1387 end_line: 1388 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4101,6 +4269,7 @@ other_license_detections: - score: '100.0' start_line: 1396 end_line: 1397 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -4114,6 +4283,7 @@ other_license_detections: - score: '100.0' start_line: 1400 end_line: 1402 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -4131,6 +4301,7 @@ other_license_detections: - score: '100.0' start_line: 1408 end_line: 1408 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4145,6 +4316,7 @@ other_license_detections: - score: '100.0' start_line: 1415 end_line: 1416 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4161,6 +4333,7 @@ other_license_detections: - score: '100.0' start_line: 1422 end_line: 1422 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4175,6 +4348,7 @@ other_license_detections: - score: '100.0' start_line: 1429 end_line: 1430 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4191,6 +4365,7 @@ other_license_detections: - score: '100.0' start_line: 1437 end_line: 1437 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -4205,6 +4380,7 @@ other_license_detections: - score: '100.0' start_line: 1444 end_line: 1445 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4221,6 +4397,7 @@ other_license_detections: - score: '100.0' start_line: 1455 end_line: 1456 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4237,6 +4414,7 @@ other_license_detections: - score: '100.0' start_line: 1463 end_line: 1464 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4253,6 +4431,7 @@ other_license_detections: - score: '100.0' start_line: 1473 end_line: 1479 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -4274,6 +4453,7 @@ other_license_detections: - score: '100.0' start_line: 1502 end_line: 1503 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4290,6 +4470,7 @@ other_license_detections: - score: '100.0' start_line: 1513 end_line: 1514 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4306,6 +4487,7 @@ other_license_detections: - score: '100.0' start_line: 1522 end_line: 1523 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4322,6 +4504,7 @@ other_license_detections: - score: '100.0' start_line: 1533 end_line: 1534 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4338,6 +4521,7 @@ other_license_detections: - score: '100.0' start_line: 1543 end_line: 1544 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4354,6 +4538,7 @@ other_license_detections: - score: '100.0' start_line: 1563 end_line: 1564 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4370,6 +4555,7 @@ other_license_detections: - score: '100.0' start_line: 1573 end_line: 1575 + from_file: matched_length: 30 match_coverage: '100.0' matcher: 1-hash @@ -4387,6 +4573,7 @@ other_license_detections: - score: '100.0' start_line: 1585 end_line: 1586 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4403,6 +4590,7 @@ other_license_detections: - score: '100.0' start_line: 1593 end_line: 1594 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4419,6 +4607,7 @@ other_license_detections: - score: '100.0' start_line: 1602 end_line: 1603 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4435,6 +4624,7 @@ other_license_detections: - score: '95.0' start_line: 1612 end_line: 1613 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -4451,6 +4641,7 @@ other_license_detections: - score: '100.0' start_line: 1620 end_line: 1621 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4467,6 +4658,7 @@ other_license_detections: - score: '100.0' start_line: 1628 end_line: 1629 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -4483,6 +4675,7 @@ other_license_detections: - score: '100.0' start_line: 1636 end_line: 1637 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4499,6 +4692,7 @@ other_license_detections: - score: '95.0' start_line: 1644 end_line: 1646 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -4516,6 +4710,7 @@ other_license_detections: - score: '95.0' start_line: 1655 end_line: 1655 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -4531,6 +4726,7 @@ other_license_detections: - score: '100.0' start_line: 1662 end_line: 1663 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4547,6 +4743,7 @@ other_license_detections: - score: '100.0' start_line: 1670 end_line: 1672 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -4564,6 +4761,7 @@ other_license_detections: - score: '100.0' start_line: 1679 end_line: 1680 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4580,6 +4778,7 @@ other_license_detections: - score: '90.0' start_line: 1687 end_line: 1687 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -4594,6 +4793,7 @@ other_license_detections: - score: '95.0' start_line: 1707 end_line: 1708 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4610,6 +4810,7 @@ other_license_detections: - score: '95.0' start_line: 1716 end_line: 1717 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -4623,6 +4824,7 @@ other_license_detections: - score: '100.0' start_line: 1725 end_line: 1726 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -4639,6 +4841,7 @@ other_license_detections: - score: '100.0' start_line: 1733 end_line: 1735 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -4656,6 +4859,7 @@ other_license_detections: - score: '100.0' start_line: 1742 end_line: 1743 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4672,6 +4876,7 @@ other_license_detections: - score: '100.0' start_line: 1751 end_line: 1752 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4688,6 +4893,7 @@ other_license_detections: - score: '99.0' start_line: 1758 end_line: 1758 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 1-hash @@ -4702,6 +4908,7 @@ other_license_detections: - score: '95.0' start_line: 1764 end_line: 1765 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -4718,6 +4925,7 @@ other_license_detections: - score: '100.0' start_line: 1776 end_line: 1777 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4734,6 +4942,7 @@ other_license_detections: - score: '100.0' start_line: 1787 end_line: 1788 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4750,6 +4959,7 @@ other_license_detections: - score: '100.0' start_line: 1795 end_line: 1796 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4766,6 +4976,7 @@ other_license_detections: - score: '100.0' start_line: 1814 end_line: 1814 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4780,6 +4991,7 @@ other_license_detections: - score: '100.0' start_line: 1821 end_line: 1822 + from_file: matched_length: 14 match_coverage: '100.0' matcher: 1-hash @@ -4796,6 +5008,7 @@ other_license_detections: - score: '100.0' start_line: 1833 end_line: 1834 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4809,6 +5022,7 @@ other_license_detections: - score: '100.0' start_line: 1836 end_line: 1840 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -4828,6 +5042,7 @@ other_license_detections: - score: '100.0' start_line: 1849 end_line: 1851 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -4845,6 +5060,7 @@ other_license_detections: - score: '100.0' start_line: 1860 end_line: 1860 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4859,6 +5075,7 @@ other_license_detections: - score: '100.0' start_line: 1869 end_line: 1869 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4873,6 +5090,7 @@ other_license_detections: - score: '100.0' start_line: 1876 end_line: 1876 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4887,6 +5105,7 @@ other_license_detections: - score: '100.0' start_line: 1886 end_line: 1887 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4900,6 +5119,7 @@ other_license_detections: - score: '100.0' start_line: 1889 end_line: 1893 + from_file: matched_length: 53 match_coverage: '100.0' matcher: 2-aho @@ -4919,6 +5139,7 @@ other_license_detections: - score: '100.0' start_line: '1908' end_line: '1909' + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4935,6 +5156,7 @@ other_license_detections: - score: '100.0' start_line: '1916' end_line: '1917' + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4948,6 +5170,7 @@ other_license_detections: - score: '100.0' start_line: '1919' end_line: '1923' + from_file: matched_length: 53 match_coverage: '100.0' matcher: 2-aho @@ -4967,6 +5190,7 @@ other_license_detections: - score: '100.0' start_line: '1933' end_line: '1933' + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4981,6 +5205,7 @@ other_license_detections: - score: '100.0' start_line: '1940' end_line: '1940' + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4995,6 +5220,7 @@ other_license_detections: - score: '100.0' start_line: '1947' end_line: '1947' + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -5009,6 +5235,7 @@ other_license_detections: - score: '100.0' start_line: '1963' end_line: '1964' + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -5025,6 +5252,7 @@ other_license_detections: - score: '100.0' start_line: '1985' end_line: 2000 + from_file: matched_length: 103 match_coverage: '100.0' matcher: 2-aho @@ -5055,6 +5283,7 @@ other_license_detections: - score: '100.0' start_line: 2014 end_line: 2016 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 2-aho @@ -5072,6 +5301,7 @@ other_license_detections: - score: '100.0' start_line: 2041 end_line: 2065 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -5111,6 +5341,7 @@ other_license_detections: - score: '100.0' start_line: 2072 end_line: 2079 + from_file: matched_length: 49 match_coverage: '100.0' matcher: 2-aho @@ -5130,6 +5361,7 @@ other_license_detections: - score: '100.0' start_line: 2082 end_line: 2082 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -5144,6 +5376,7 @@ other_license_detections: - score: '95.0' start_line: 2095 end_line: 2098 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho 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 271fda4b6fd..32c866263e8 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 @@ -38,6 +38,7 @@ license_detections: - score: '100.0' start_line: 17 end_line: 17 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -49,6 +50,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 33 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 2-aho @@ -76,6 +78,7 @@ license_detections: - score: '100.0' start_line: 37 end_line: 38 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +95,7 @@ license_detections: - score: '100.0' start_line: 44 end_line: 62 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -125,6 +129,7 @@ license_detections: - score: '100.0' start_line: 68 end_line: 73 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -145,6 +150,7 @@ license_detections: - score: '100.0' start_line: 79 end_line: 81 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -162,6 +168,7 @@ license_detections: - score: '100.0' start_line: 87 end_line: 89 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -179,6 +186,7 @@ license_detections: - score: '100.0' start_line: 94 end_line: 96 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -196,6 +204,7 @@ license_detections: - score: '100.0' start_line: 102 end_line: 104 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -213,6 +222,7 @@ license_detections: - score: '100.0' start_line: 111 end_line: 113 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -230,6 +240,7 @@ license_detections: - score: '100.0' start_line: 120 end_line: 122 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -247,6 +258,7 @@ license_detections: - score: '100.0' start_line: 128 end_line: 130 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -264,6 +276,7 @@ license_detections: - score: '100.0' start_line: 137 end_line: 139 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -281,6 +294,7 @@ license_detections: - score: '100.0' start_line: 144 end_line: 146 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -298,6 +312,7 @@ license_detections: - score: '100.0' start_line: 152 end_line: 159 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -320,6 +335,7 @@ license_detections: - score: '100.0' start_line: 164 end_line: 166 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -337,6 +353,7 @@ license_detections: - score: '100.0' start_line: 171 end_line: 173 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -354,6 +371,7 @@ license_detections: - score: '100.0' start_line: 179 end_line: 181 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -371,6 +389,7 @@ license_detections: - score: '100.0' start_line: 187 end_line: 189 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -388,6 +407,7 @@ license_detections: - score: '100.0' start_line: '195' end_line: '197' + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -405,6 +425,7 @@ license_detections: - score: '100.0' start_line: 203 end_line: 205 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -422,6 +443,7 @@ license_detections: - score: '100.0' start_line: 211 end_line: 213 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -439,6 +461,7 @@ license_detections: - score: '100.0' start_line: 219 end_line: 221 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -456,6 +479,7 @@ license_detections: - score: '100.0' start_line: 226 end_line: 228 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -473,6 +497,7 @@ license_detections: - score: '100.0' start_line: 235 end_line: 237 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -490,6 +515,7 @@ license_detections: - score: '100.0' start_line: 243 end_line: 245 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -507,6 +533,7 @@ license_detections: - score: '100.0' start_line: 251 end_line: 253 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -524,6 +551,7 @@ license_detections: - score: '100.0' start_line: 259 end_line: 261 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -541,6 +569,7 @@ license_detections: - score: '100.0' start_line: 266 end_line: 268 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -558,6 +587,7 @@ license_detections: - score: '100.0' start_line: 275 end_line: 277 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -575,6 +605,7 @@ license_detections: - score: '100.0' start_line: 283 end_line: 285 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -592,6 +623,7 @@ license_detections: - score: '100.0' start_line: 291 end_line: 293 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -609,6 +641,7 @@ license_detections: - score: '100.0' start_line: 299 end_line: 317 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -642,6 +675,7 @@ license_detections: - score: '100.0' start_line: 323 end_line: 325 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -659,6 +693,7 @@ license_detections: - score: '100.0' start_line: 332 end_line: 334 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -676,6 +711,7 @@ license_detections: - score: '100.0' start_line: 340 end_line: 342 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -693,6 +729,7 @@ license_detections: - score: '100.0' start_line: 347 end_line: 349 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -710,6 +747,7 @@ license_detections: - score: '100.0' start_line: 354 end_line: 356 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -727,6 +765,7 @@ license_detections: - score: '100.0' start_line: 363 end_line: 365 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -744,6 +783,7 @@ license_detections: - score: '100.0' start_line: 371 end_line: 373 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -761,6 +801,7 @@ license_detections: - score: '100.0' start_line: 382 end_line: 384 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -778,6 +819,7 @@ license_detections: - score: '100.0' start_line: 389 end_line: 391 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -795,6 +837,7 @@ license_detections: - score: '100.0' start_line: 397 end_line: 399 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -812,6 +855,7 @@ license_detections: - score: '100.0' start_line: 405 end_line: 407 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -829,6 +873,7 @@ license_detections: - score: '100.0' start_line: 413 end_line: 415 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -846,6 +891,7 @@ license_detections: - score: '100.0' start_line: 422 end_line: 424 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -863,6 +909,7 @@ license_detections: - score: '100.0' start_line: 430 end_line: 432 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -880,6 +927,7 @@ license_detections: - score: '100.0' start_line: 440 end_line: 442 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -897,6 +945,7 @@ license_detections: - score: '100.0' start_line: 447 end_line: 449 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -914,6 +963,7 @@ license_detections: - score: '100.0' start_line: 454 end_line: 456 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -931,6 +981,7 @@ license_detections: - score: '100.0' start_line: 465 end_line: 467 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -948,6 +999,7 @@ license_detections: - score: '100.0' start_line: 472 end_line: 474 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -965,6 +1017,7 @@ license_detections: - score: '100.0' start_line: 479 end_line: 481 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -982,6 +1035,7 @@ license_detections: - score: '100.0' start_line: 487 end_line: 489 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -999,6 +1053,7 @@ license_detections: - score: '100.0' start_line: 495 end_line: 497 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1016,6 +1071,7 @@ license_detections: - score: '100.0' start_line: 502 end_line: 504 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1033,6 +1089,7 @@ license_detections: - score: '100.0' start_line: 511 end_line: 513 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1050,6 +1107,7 @@ license_detections: - score: '100.0' start_line: 518 end_line: 520 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1067,6 +1125,7 @@ license_detections: - score: '100.0' start_line: 525 end_line: 527 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1084,6 +1143,7 @@ license_detections: - score: '100.0' start_line: 533 end_line: 535 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1101,6 +1161,7 @@ license_detections: - score: '100.0' start_line: 540 end_line: 542 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1118,6 +1179,7 @@ license_detections: - score: '100.0' start_line: 547 end_line: 549 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1135,6 +1197,7 @@ license_detections: - score: '100.0' start_line: 554 end_line: 556 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1152,6 +1215,7 @@ license_detections: - score: '100.0' start_line: 561 end_line: 563 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1169,6 +1233,7 @@ license_detections: - score: '100.0' start_line: 568 end_line: 570 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1186,6 +1251,7 @@ license_detections: - score: '100.0' start_line: 576 end_line: 578 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -1203,6 +1269,7 @@ license_detections: - score: '100.0' start_line: 585 end_line: 587 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1220,6 +1287,7 @@ license_detections: - score: '100.0' start_line: 594 end_line: 596 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1237,6 +1305,7 @@ license_detections: - score: '100.0' start_line: 602 end_line: 604 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -1251,6 +1320,7 @@ license_detections: - score: '100.0' start_line: 608 end_line: 610 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho 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 f4a3879c4b9..579c201364d 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 @@ -36,6 +36,7 @@ other_license_detections: - score: '100.0' start_line: 84 end_line: 84 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -47,6 +48,7 @@ other_license_detections: - score: '100.0' start_line: 85 end_line: 95 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -69,6 +71,7 @@ other_license_detections: - score: '100.0' start_line: 97 end_line: 98 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -85,6 +88,7 @@ other_license_detections: - score: '100.0' start_line: 101 end_line: 118 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -117,6 +121,7 @@ other_license_detections: - score: '89.1' start_line: 121 end_line: 169 + from_file: matched_length: 327 match_coverage: '89.1' matcher: 3-seq @@ -180,6 +185,7 @@ other_license_detections: - score: '100.0' start_line: 172 end_line: '191' + from_file: matched_length: 185 match_coverage: '100.0' matcher: 1-hash @@ -214,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: 217 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 1-hash @@ -252,6 +259,7 @@ other_license_detections: - score: '99.0' start_line: 76 end_line: 76 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho 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 cd9a362b436..c10e315edfa 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 10 end_line: 25 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 2-aho @@ -40,6 +41,7 @@ license_detections: - score: '100.0' start_line: 32 end_line: 37 + from_file: matched_length: 43 match_coverage: '100.0' matcher: 2-aho @@ -60,6 +62,7 @@ license_detections: - score: '100.0' start_line: 43 end_line: 58 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 2-aho @@ -87,6 +90,7 @@ license_detections: - score: '100.0' start_line: 61 end_line: 61 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho 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 ba6502d5c5c..3e8f69e91dd 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 @@ -13,6 +13,7 @@ other_license_detections: - score: '100.0' start_line: 14 end_line: 31 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 f5c259ef130..50d11eb8c6e 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 @@ -13,6 +13,7 @@ other_license_detections: - score: '97.65' start_line: '19' end_line: 99 + from_file: matched_length: 582 match_coverage: '97.65' matcher: 3-seq 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 efd50e78d75..835efaa4a7d 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 @@ -37,6 +37,7 @@ other_license_detections: - score: '100.0' start_line: 21 end_line: 21 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -51,6 +52,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 101 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +90,7 @@ other_license_detections: - score: '98.88' start_line: 106 end_line: 124 + from_file: matched_length: 176 match_coverage: '100.0' matcher: 2-aho @@ -121,6 +124,7 @@ other_license_detections: - score: '100.0' start_line: 127 end_line: 143 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -152,6 +156,7 @@ other_license_detections: - score: '100.0' start_line: 145 end_line: 145 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -163,6 +168,7 @@ other_license_detections: - score: '100.0' start_line: 148 end_line: 150 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -177,6 +183,7 @@ other_license_detections: - score: '100.0' start_line: 152 end_line: 156 + from_file: matched_length: 59 match_coverage: '100.0' matcher: 2-aho @@ -196,6 +203,7 @@ other_license_detections: - score: '100.0' start_line: 158 end_line: 158 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -207,6 +215,7 @@ other_license_detections: - score: '100.0' start_line: 159 end_line: 173 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -236,6 +245,7 @@ other_license_detections: - score: '100.0' start_line: 175 end_line: 175 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -247,6 +257,7 @@ other_license_detections: - score: '100.0' start_line: 176 end_line: 187 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -270,6 +281,7 @@ other_license_detections: - score: '100.0' start_line: 189 end_line: '190' + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho 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 645e0bcea9d..705190399f8 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 @@ -36,6 +36,7 @@ other_license_detections: - score: '100.0' start_line: 21 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 1-hash @@ -53,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 33 end_line: 34 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -69,6 +71,7 @@ other_license_detections: - score: '100.0' start_line: 78 end_line: 78 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -80,6 +83,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 80 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -96,6 +100,7 @@ other_license_detections: - score: '100.0' start_line: 82 end_line: 82 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -107,6 +112,7 @@ other_license_detections: - score: '100.0' start_line: 83 end_line: 84 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -123,6 +129,7 @@ other_license_detections: - score: '100.0' start_line: 86 end_line: 86 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -134,6 +141,7 @@ other_license_detections: - score: '100.0' start_line: 87 end_line: 102 + from_file: matched_length: 119 match_coverage: '100.0' matcher: 1-hash @@ -164,6 +172,7 @@ other_license_detections: - score: '100.0' start_line: 107 end_line: 131 + from_file: matched_length: 204 match_coverage: '100.0' matcher: 2-aho @@ -203,6 +212,7 @@ other_license_detections: - score: '100.0' start_line: 136 end_line: 155 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +247,7 @@ other_license_detections: - score: '100.0' start_line: 158 end_line: 174 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -268,6 +279,7 @@ other_license_detections: - score: '100.0' start_line: 177 end_line: 208 + from_file: matched_length: 328 match_coverage: '100.0' matcher: 1-hash @@ -314,6 +326,7 @@ other_license_detections: - score: '100.0' start_line: 211 end_line: 396 + from_file: matched_length: 1626 match_coverage: '100.0' matcher: 1-hash 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 09647f49932..583cbb9a814 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 @@ -33,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 62 end_line: 63 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -49,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 114 end_line: 130 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -80,6 +82,7 @@ other_license_detections: - score: '100.0' start_line: 132 end_line: 132 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -91,6 +94,7 @@ other_license_detections: - score: '100.0' start_line: 133 end_line: 148 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -121,6 +125,7 @@ other_license_detections: - score: '100.0' start_line: 150 end_line: 150 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +137,7 @@ other_license_detections: - score: '100.0' start_line: 151 end_line: 166 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -162,6 +168,7 @@ other_license_detections: - score: '100.0' start_line: 168 end_line: 168 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +180,7 @@ other_license_detections: - score: '100.0' start_line: 169 end_line: 184 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -203,6 +211,7 @@ other_license_detections: - score: '100.0' start_line: 186 end_line: 186 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -214,6 +223,7 @@ other_license_detections: - score: '100.0' start_line: 187 end_line: '195' + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash 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 792edd7f6c7..811db57b9af 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 9 end_line: 9 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho 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 24d34548373..7e392de5e81 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: 76 + from_file: matched_length: 527 match_coverage: '100.0' matcher: 2-aho 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 03bcc6c39ea..ef70979e65e 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 @@ -48,6 +48,7 @@ other_license_detections: - score: '100.0' start_line: 1015 end_line: 1017 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -65,6 +66,7 @@ other_license_detections: - score: '100.0' start_line: 1045 end_line: 1064 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash @@ -99,6 +101,7 @@ other_license_detections: - score: '100.0' start_line: 1067 end_line: 1091 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 1-hash @@ -138,6 +141,7 @@ other_license_detections: - score: '100.0' start_line: 1094 end_line: 1112 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -171,6 +175,7 @@ other_license_detections: - score: '100.0' start_line: 1115 end_line: 1138 + from_file: matched_length: 202 match_coverage: '100.0' matcher: 1-hash @@ -209,6 +214,7 @@ other_license_detections: - score: '100.0' start_line: 1140 end_line: 1140 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -220,6 +226,7 @@ other_license_detections: - score: '100.0' start_line: 1141 end_line: 1150 + from_file: matched_length: 81 match_coverage: '100.0' matcher: 1-hash @@ -244,6 +251,7 @@ other_license_detections: - score: '100.0' start_line: 1152 end_line: 1152 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -255,6 +263,7 @@ other_license_detections: - score: '100.0' start_line: 1153 end_line: 1163 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 1-hash @@ -280,6 +289,7 @@ other_license_detections: - score: '100.0' start_line: 1165 end_line: 1165 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -291,6 +301,7 @@ other_license_detections: - score: '100.0' start_line: 1166 end_line: 1175 + from_file: matched_length: 83 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +326,7 @@ other_license_detections: - score: '100.0' start_line: 1177 end_line: 1177 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +338,7 @@ other_license_detections: - score: '100.0' start_line: 1178 end_line: 1188 + from_file: matched_length: 94 match_coverage: '100.0' matcher: 1-hash @@ -351,6 +364,7 @@ other_license_detections: - score: '100.0' start_line: 1190 end_line: 1190 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -362,6 +376,7 @@ other_license_detections: - score: '100.0' start_line: 1191 end_line: 1201 + from_file: matched_length: 91 match_coverage: '100.0' matcher: 1-hash @@ -387,6 +402,7 @@ other_license_detections: - score: '100.0' start_line: 1203 end_line: 1203 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -398,6 +414,7 @@ other_license_detections: - score: '100.0' start_line: 1204 end_line: 1215 + from_file: matched_length: 100 match_coverage: '100.0' matcher: 1-hash @@ -424,6 +441,7 @@ other_license_detections: - score: '100.0' start_line: 1218 end_line: 1241 + from_file: matched_length: 227 match_coverage: '100.0' matcher: 1-hash @@ -462,6 +480,7 @@ other_license_detections: - score: '100.0' start_line: 1243 end_line: 1243 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -473,6 +492,7 @@ other_license_detections: - score: '100.0' start_line: 1244 end_line: 1710 + from_file: matched_length: 3710 match_coverage: '100.0' matcher: 1-hash @@ -954,6 +974,7 @@ other_license_detections: - score: '100.0' start_line: 1712 end_line: 1712 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -965,6 +986,7 @@ other_license_detections: - score: '100.0' start_line: 1713 end_line: 1714 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 1-hash @@ -981,6 +1003,7 @@ other_license_detections: - score: '100.0' start_line: 1717 end_line: 1729 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 1-hash @@ -1008,6 +1031,7 @@ other_license_detections: - score: '100.0' start_line: 9 end_line: 9 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho 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 fed6d8c35b5..8b11e2b6dd2 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 @@ -11,6 +11,7 @@ other_license_detections: - score: '100.0' start_line: 9 end_line: 9 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -22,6 +23,7 @@ other_license_detections: - score: '100.0' start_line: 10 end_line: 24 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 1-hash 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 d1d01db3853..35b2339cfdd 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 @@ -33,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 43 end_line: 100 + from_file: matched_length: 454 match_coverage: '100.0' matcher: 2-aho @@ -105,6 +106,7 @@ other_license_detections: - score: '100.0' start_line: 105 end_line: 105 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -119,6 +121,7 @@ other_license_detections: - score: '100.0' start_line: 116 end_line: 126 + from_file: matched_length: 96 match_coverage: '100.0' matcher: 1-hash @@ -144,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 129 end_line: 135 + from_file: matched_length: 51 match_coverage: '100.0' matcher: 1-hash @@ -165,6 +169,7 @@ other_license_detections: - score: '100.0' start_line: 137 end_line: 137 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -176,6 +181,7 @@ other_license_detections: - score: '100.0' start_line: 138 end_line: 143 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -196,6 +202,7 @@ other_license_detections: - score: '100.0' start_line: 145 end_line: 145 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -207,6 +214,7 @@ other_license_detections: - score: '100.0' start_line: 146 end_line: 152 + from_file: matched_length: 50 match_coverage: '100.0' matcher: 1-hash @@ -228,6 +236,7 @@ other_license_detections: - score: '100.0' start_line: 154 end_line: 154 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -239,6 +248,7 @@ other_license_detections: - score: '100.0' start_line: 155 end_line: 159 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -258,6 +268,7 @@ other_license_detections: - score: '100.0' start_line: 163 end_line: 179 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -289,6 +300,7 @@ other_license_detections: - score: '100.0' start_line: 182 end_line: 207 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -329,6 +341,7 @@ other_license_detections: - score: '100.0' start_line: 35 end_line: 36 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho 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 5cf3dc29b60..c45530a079d 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 @@ -12,6 +12,7 @@ other_license_detections: - score: '100.0' start_line: 8 end_line: 24 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -43,6 +44,7 @@ other_license_detections: - score: '100.0' start_line: 29 end_line: 29 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -54,6 +56,7 @@ other_license_detections: - score: '100.0' start_line: 30 end_line: 44 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash 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 95cac4ff9a5..1ced94fb7e0 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 20 + from_file: matched_length: 114 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho 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 cf9f9a1911c..373b8c20640 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 @@ -11,6 +11,7 @@ license_detections: - score: '97.67' start_line: 14 end_line: 31 + from_file: matched_length: 168 match_coverage: '100.0' matcher: 3-seq @@ -43,6 +44,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 86 + from_file: matched_length: 427 match_coverage: '100.0' matcher: 2-aho 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 9b7bb6783a8..3f8934f0dac 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 @@ -20,6 +20,7 @@ license_detections: - score: '96.74' start_line: 12 end_line: 46 + from_file: matched_length: 267 match_coverage: '96.74' matcher: 3-seq @@ -70,6 +71,7 @@ license_detections: - score: '99.15' start_line: 57 end_line: 85 + from_file: matched_length: 234 match_coverage: '100.0' matcher: 3-seq @@ -110,6 +112,7 @@ license_detections: - score: '100.0' start_line: 87 end_line: 97 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho @@ -132,6 +135,7 @@ license_detections: - score: '100.0' start_line: 99 end_line: 128 + from_file: matched_length: 231 match_coverage: '100.0' matcher: 2-aho @@ -173,6 +177,7 @@ license_detections: - score: '100.0' start_line: 130 end_line: 142 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 2-aho @@ -197,6 +202,7 @@ license_detections: - score: '100.0' start_line: 144 end_line: 161 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -229,6 +235,7 @@ license_detections: - score: '100.0' start_line: 205 end_line: 248 + from_file: matched_length: 390 match_coverage: '100.0' matcher: 2-aho 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 ba5da2837f0..3680e1a823b 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 @@ -9,6 +9,7 @@ license_detections: - score: '87.5' start_line: 4 end_line: 9 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 3-seq 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 3d205f464d2..2b2ec96f31c 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 @@ -9,6 +9,7 @@ license_detections: - score: '87.5' start_line: 6 end_line: 11 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 3-seq 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 d6197c579b9..585c08d0b63 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 4 end_line: 207 + from_file: matched_length: 1770 match_coverage: '100.0' matcher: 2-aho 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 c78fcfb25c8..4b391a34d54 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 62 + from_file: matched_length: 541 match_coverage: '100.0' matcher: 2-aho 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 3aca6dd0e42..b7d002f1e26 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 @@ -20,6 +20,7 @@ license_detections: - score: '100.0' start_line: 11 end_line: 46 + from_file: matched_length: 295 match_coverage: '100.0' matcher: 2-aho @@ -70,6 +71,7 @@ license_detections: - score: '95.0' start_line: 53 end_line: 87 + from_file: matched_length: 268 match_coverage: '100.0' matcher: 2-aho @@ -121,6 +123,7 @@ license_detections: - score: '95.0' start_line: 101 end_line: 135 + from_file: matched_length: 268 match_coverage: '100.0' matcher: 2-aho @@ -167,6 +170,7 @@ license_detections: - score: '100.0' start_line: 139 end_line: 143 + from_file: matched_length: 48 match_coverage: '100.0' matcher: 2-aho @@ -183,6 +187,7 @@ license_detections: - score: '100.0' start_line: 149 end_line: 158 + from_file: matched_length: 103 match_coverage: '100.0' matcher: 2-aho @@ -204,6 +209,7 @@ license_detections: - score: '100.0' start_line: 165 end_line: 186 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -237,6 +243,7 @@ license_detections: - score: '100.0' start_line: '194' end_line: 203 + from_file: matched_length: 93 match_coverage: '100.0' matcher: 2-aho @@ -258,6 +265,7 @@ license_detections: - score: '100.0' start_line: 212 end_line: 229 + from_file: matched_length: 151 match_coverage: '100.0' matcher: 2-aho @@ -287,6 +295,7 @@ license_detections: - score: '100.0' start_line: 236 end_line: 247 + from_file: matched_length: 98 match_coverage: '100.0' matcher: 2-aho @@ -310,6 +319,7 @@ license_detections: - score: '100.0' start_line: 266 end_line: 268 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -324,6 +334,7 @@ license_detections: - score: '100.0' start_line: 274 end_line: 283 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -345,6 +356,7 @@ license_detections: - score: '100.0' start_line: 289 end_line: 296 + from_file: matched_length: 55 match_coverage: '100.0' matcher: 2-aho @@ -364,6 +376,7 @@ license_detections: - score: '100.0' start_line: 302 end_line: 310 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 2-aho @@ -384,6 +397,7 @@ license_detections: - score: '100.0' start_line: 317 end_line: 337 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -416,6 +430,7 @@ license_detections: - score: '95.0' start_line: 343 end_line: 354 + from_file: matched_length: 95 match_coverage: '100.0' matcher: 2-aho @@ -439,6 +454,7 @@ license_detections: - score: '100.0' start_line: 369 end_line: 394 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -476,6 +492,7 @@ license_detections: - score: '100.0' start_line: 401 end_line: 420 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -507,6 +524,7 @@ license_detections: - score: '100.0' start_line: 427 end_line: 446 + from_file: matched_length: 181 match_coverage: '100.0' matcher: 2-aho @@ -538,6 +556,7 @@ license_detections: - score: '100.0' start_line: 453 end_line: 472 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -569,6 +588,7 @@ license_detections: - score: '99.0' start_line: 480 end_line: 489 + from_file: matched_length: 89 match_coverage: '100.0' matcher: 2-aho @@ -590,6 +610,7 @@ license_detections: - score: '100.0' start_line: 496 end_line: 515 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -621,6 +642,7 @@ license_detections: - score: '100.0' start_line: 522 end_line: 542 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 2-aho @@ -653,6 +675,7 @@ license_detections: - score: '100.0' start_line: 548 end_line: 553 + from_file: matched_length: 45 match_coverage: '100.0' matcher: 2-aho @@ -670,6 +693,7 @@ license_detections: - score: '100.0' start_line: 563 end_line: 585 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho @@ -704,6 +728,7 @@ license_detections: - score: '100.0' start_line: 591 end_line: 600 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -725,6 +750,7 @@ license_detections: - score: '100.0' start_line: 609 end_line: 628 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -756,6 +782,7 @@ license_detections: - score: '100.0' start_line: 635 end_line: 654 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -787,6 +814,7 @@ license_detections: - score: '100.0' start_line: 663 end_line: 682 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -818,6 +846,7 @@ license_detections: - score: '100.0' start_line: 693 end_line: 715 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -852,6 +881,7 @@ license_detections: - score: '100.0' start_line: 723 end_line: 742 + from_file: matched_length: 179 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +913,7 @@ license_detections: - score: '100.0' start_line: 749 end_line: 768 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -914,6 +945,7 @@ license_detections: - score: '100.0' start_line: 775 end_line: 794 + from_file: matched_length: 181 match_coverage: '100.0' matcher: 2-aho @@ -945,6 +977,7 @@ license_detections: - score: '100.0' start_line: 801 end_line: 820 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -976,6 +1009,7 @@ license_detections: - score: '100.0' start_line: 827 end_line: 846 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1007,6 +1041,7 @@ license_detections: - score: '100.0' start_line: 854 end_line: 875 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -1040,6 +1075,7 @@ license_detections: - score: '100.0' start_line: 881 end_line: 906 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1077,6 +1113,7 @@ license_detections: - score: '100.0' start_line: 914 end_line: 941 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1116,6 +1153,7 @@ license_detections: - score: '100.0' start_line: 947 end_line: 955 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 2-aho @@ -1136,6 +1174,7 @@ license_detections: - score: '100.0' start_line: 962 end_line: 982 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 2-aho @@ -1168,6 +1207,7 @@ license_detections: - score: '100.0' start_line: 989 end_line: 1012 + from_file: matched_length: 218 match_coverage: '100.0' matcher: 2-aho @@ -1203,6 +1243,7 @@ license_detections: - score: '100.0' start_line: 1019 end_line: 1038 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho 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 e46164a27b3..d5454289030 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 @@ -9,6 +9,7 @@ license_detections: - score: '95.0' start_line: 8 end_line: 46 + from_file: matched_length: 268 match_coverage: '100.0' matcher: 2-aho 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 7545fd115f3..a79b1d291ec 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 332 + from_file: matched_length: 2975 match_coverage: '100.0' matcher: 2-aho 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 ff0d2663760..74a4116cc9c 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 154 + from_file: matched_length: 1277 match_coverage: '100.0' matcher: 2-aho 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 1fbfff5b02f..5647df455a8 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 42 + from_file: matched_length: 295 match_coverage: '100.0' matcher: 2-aho 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 4aa7e0909a1..d1e69bdd3df 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 @@ -11,6 +11,7 @@ license_detections: - score: '96.37' start_line: 11 end_line: 48 + from_file: matched_length: 292 match_coverage: '96.37' matcher: 3-seq @@ -63,6 +64,7 @@ license_detections: - score: '100.0' start_line: 55 end_line: 84 + from_file: matched_length: 242 match_coverage: '100.0' matcher: 2-aho 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 95cac4ff9a5..1ced94fb7e0 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 20 + from_file: matched_length: 114 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho 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 95cac4ff9a5..1ced94fb7e0 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 20 + from_file: matched_length: 114 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho 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 662344e7715..879f7ceb6de 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 @@ -60,6 +60,7 @@ license_detections: - score: '100.0' start_line: 11 end_line: 38 + from_file: matched_length: 264 match_coverage: '100.0' matcher: 2-aho @@ -102,6 +103,7 @@ license_detections: - score: '100.0' start_line: 46 end_line: 49 + from_file: matched_length: 30 match_coverage: '100.0' matcher: 2-aho @@ -120,6 +122,7 @@ license_detections: - score: '100.0' start_line: 56 end_line: 92 + from_file: matched_length: 296 match_coverage: '100.0' matcher: 1-hash @@ -171,6 +174,7 @@ license_detections: - score: '100.0' start_line: 97 end_line: 109 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +202,7 @@ license_detections: - score: '100.0' start_line: 116 end_line: 159 + from_file: matched_length: 364 match_coverage: '100.0' matcher: 2-aho @@ -256,6 +261,7 @@ license_detections: - score: '100.0' start_line: 164 end_line: 166 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -273,6 +279,7 @@ license_detections: - score: '100.0' start_line: 173 end_line: '193' + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -308,6 +315,7 @@ license_detections: - score: '100.0' start_line: 200 end_line: 223 + from_file: matched_length: '199' match_coverage: '100.0' matcher: 2-aho @@ -346,6 +354,7 @@ license_detections: - score: '100.0' start_line: 228 end_line: 231 + from_file: matched_length: 30 match_coverage: '100.0' matcher: 1-hash @@ -364,6 +373,7 @@ license_detections: - score: '100.0' start_line: 236 end_line: 247 + from_file: matched_length: 120 match_coverage: '100.0' matcher: 1-hash @@ -390,6 +400,7 @@ license_detections: - score: '100.0' start_line: 252 end_line: 264 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 1-hash @@ -417,6 +428,7 @@ license_detections: - score: '100.0' start_line: 269 end_line: 281 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 1-hash @@ -444,6 +456,7 @@ license_detections: - score: '100.0' start_line: 286 end_line: 293 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +479,7 @@ license_detections: - score: '100.0' start_line: 300 end_line: 323 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 2-aho @@ -504,6 +518,7 @@ license_detections: - score: '100.0' start_line: 328 end_line: 339 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 1-hash @@ -530,6 +545,7 @@ license_detections: - score: '100.0' start_line: 344 end_line: 350 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 1-hash @@ -551,6 +567,7 @@ license_detections: - score: '100.0' start_line: 355 end_line: 363 + from_file: matched_length: 73 match_coverage: '100.0' matcher: 1-hash @@ -574,6 +591,7 @@ license_detections: - score: '95.0' start_line: 370 end_line: 403 + from_file: matched_length: 268 match_coverage: '100.0' matcher: 2-aho @@ -622,6 +640,7 @@ license_detections: - score: '100.0' start_line: 414 end_line: 457 + from_file: matched_length: 384 match_coverage: '100.0' matcher: 2-aho @@ -680,6 +699,7 @@ license_detections: - score: '100.0' start_line: 462 end_line: 487 + from_file: matched_length: 233 match_coverage: '100.0' matcher: 1-hash @@ -720,6 +740,7 @@ license_detections: - score: '98.77' start_line: 494 end_line: 510 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 3-seq @@ -751,6 +772,7 @@ license_detections: - score: '100.0' start_line: 515 end_line: 530 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 1-hash @@ -781,6 +803,7 @@ license_detections: - score: '100.0' start_line: 537 end_line: 572 + from_file: matched_length: 297 match_coverage: '100.0' matcher: 2-aho @@ -831,6 +854,7 @@ license_detections: - score: '100.0' start_line: 577 end_line: 577 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 1-hash @@ -845,6 +869,7 @@ license_detections: - score: '100.0' start_line: 582 end_line: 708 + from_file: matched_length: 956 match_coverage: '100.0' matcher: 1-hash @@ -986,6 +1011,7 @@ license_detections: - score: '100.0' start_line: 719 end_line: 756 + from_file: matched_length: 303 match_coverage: '100.0' matcher: 2-aho @@ -1038,6 +1064,7 @@ license_detections: - score: '100.0' start_line: 761 end_line: 768 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 1-hash @@ -1060,6 +1087,7 @@ license_detections: - score: '100.0' start_line: 775 end_line: 810 + from_file: matched_length: 297 match_coverage: '100.0' matcher: 2-aho @@ -1110,6 +1138,7 @@ license_detections: - score: '100.0' start_line: 815 end_line: 817 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -1127,6 +1156,7 @@ license_detections: - score: '100.0' start_line: 822 end_line: 824 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -1144,6 +1174,7 @@ license_detections: - score: '100.0' start_line: 829 end_line: 861 + from_file: matched_length: 266 match_coverage: '100.0' matcher: 1-hash @@ -1191,6 +1222,7 @@ license_detections: - score: '100.0' start_line: 865 end_line: 871 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 1-hash @@ -1212,6 +1244,7 @@ license_detections: - score: '100.0' start_line: 876 end_line: 911 + from_file: matched_length: 295 match_coverage: '100.0' matcher: 2-aho 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 aeb7b3d1638..51f0d37b4d7 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 @@ -9,6 +9,7 @@ license_detections: - score: '99.46' start_line: 7 end_line: 27 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho 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 00c60d6e943..846d7015432 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 68 + from_file: matched_length: 545 match_coverage: '100.0' matcher: 2-aho 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 7e525c09c5c..c8cdfb9ab59 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 34 + from_file: matched_length: 262 match_coverage: '100.0' matcher: 2-aho 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 c5d93c386dc..2ca683a2768 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 @@ -18,6 +18,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 211 + from_file: matched_length: 2208 match_coverage: '100.0' matcher: 2-aho @@ -238,6 +239,7 @@ license_detections: - score: '44.44' start_line: 231 end_line: 234 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 3-seq @@ -256,6 +258,7 @@ license_detections: - score: '100.0' start_line: 240 end_line: 244 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -272,6 +275,7 @@ license_detections: - score: '100.0' start_line: 246 end_line: 246 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -286,6 +290,7 @@ license_detections: - score: '100.0' start_line: 252 end_line: 299 + from_file: matched_length: 332 match_coverage: '100.0' matcher: 2-aho @@ -348,6 +353,7 @@ license_detections: - score: '100.0' start_line: 309 end_line: 360 + from_file: matched_length: 453 match_coverage: '100.0' matcher: 2-aho @@ -414,6 +420,7 @@ license_detections: - score: '100.0' start_line: 371 end_line: 371 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -428,6 +435,7 @@ license_detections: - score: '100.0' start_line: 380 end_line: 396 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 2-aho @@ -459,6 +467,7 @@ license_detections: - score: '100.0' start_line: 413 end_line: 415 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -476,6 +485,7 @@ license_detections: - score: '100.0' start_line: 439 end_line: 461 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -513,6 +523,7 @@ license_detections: - score: '100.0' start_line: 469 end_line: 470 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -529,6 +540,7 @@ license_detections: - score: '100.0' start_line: 514 end_line: 519 + from_file: matched_length: 74 match_coverage: '100.0' matcher: 2-aho @@ -549,6 +561,7 @@ license_detections: - score: '100.0' start_line: 531 end_line: 539 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -572,6 +585,7 @@ license_detections: - score: '100.0' start_line: 549 end_line: 564 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -602,6 +616,7 @@ license_detections: - score: '100.0' start_line: 580 end_line: 587 + from_file: matched_length: 50 match_coverage: '100.0' matcher: 2-aho @@ -624,6 +639,7 @@ license_detections: - score: '100.0' start_line: 594 end_line: 601 + from_file: matched_length: 50 match_coverage: '100.0' matcher: 2-aho @@ -646,6 +662,7 @@ license_detections: - score: '100.0' start_line: 613 end_line: 635 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 2-aho @@ -683,6 +700,7 @@ license_detections: - score: '100.0' start_line: 646 end_line: 668 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 2-aho @@ -720,6 +738,7 @@ license_detections: - score: '100.0' start_line: 677 end_line: 697 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 2-aho @@ -755,6 +774,7 @@ license_detections: - score: '100.0' start_line: 705 end_line: 715 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho 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 93c2ab5f85b..73b5bf8bcab 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 @@ -17,6 +17,7 @@ license_detections: - score: '100.0' start_line: 9 end_line: 28 + from_file: matched_length: '199' match_coverage: '100.0' matcher: 1-hash @@ -51,6 +52,7 @@ license_detections: - score: '100.0' start_line: 35 end_line: 55 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -86,6 +88,7 @@ license_detections: - score: '100.0' start_line: 61 end_line: 96 + from_file: matched_length: 260 match_coverage: '100.0' matcher: 1-hash @@ -136,6 +139,7 @@ license_detections: - score: '100.0' start_line: 102 end_line: 104 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -150,6 +154,7 @@ license_detections: - score: '97.33' start_line: 106 end_line: 112 + from_file: matched_length: 73 match_coverage: '100.0' matcher: 3-seq @@ -171,6 +176,7 @@ license_detections: - score: '100.0' start_line: 117 end_line: 119 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash 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 95cac4ff9a5..1ced94fb7e0 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 20 + from_file: matched_length: 114 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho 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 ad4fedc6c80..0ecd7057ef7 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 @@ -11,6 +11,7 @@ license_detections: - score: '100.0' start_line: 9 end_line: 11 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -28,6 +29,7 @@ license_detections: - score: '93.72' start_line: 18 end_line: 53 + from_file: matched_length: 293 match_coverage: '100.0' matcher: 3-seq 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 e7a77277558..3947d6cd827 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 13 + from_file: matched_length: 77 match_coverage: '100.0' matcher: 2-aho 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 1ee3311a618..1ee1792df41 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 @@ -9,6 +9,7 @@ license_detections: - score: '97.98' start_line: 9 end_line: 34 + from_file: matched_length: '194' match_coverage: '100.0' matcher: 3-seq 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 a6cab6541fe..2e7458472af 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 9 end_line: 65 + from_file: matched_length: 436 match_coverage: '100.0' matcher: 1-hash 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 95a591642e8..59d49376f64 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 95a591642e8..59d49376f64 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 95a591642e8..59d49376f64 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 95a591642e8..59d49376f64 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 95a591642e8..59d49376f64 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 23 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 fb87d51d875..b9f33eb27fc 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 @@ -14,6 +14,7 @@ license_detections: - score: '100.0' start_line: 21 end_line: 45 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -53,6 +54,7 @@ license_detections: - score: '100.0' start_line: 51 end_line: 254 + from_file: matched_length: 1770 match_coverage: '100.0' matcher: 1-hash @@ -206,6 +208,7 @@ license_detections: - score: '100.0' start_line: 260 end_line: 260 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -217,6 +220,7 @@ license_detections: - score: '100.0' start_line: 261 end_line: 275 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash 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 6ff8b99ca50..5ba33ca9bd3 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 42 end_line: 59 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 2-aho 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 c7ff6a9e04c..d18929be99d 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 28 end_line: 47 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho 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 b2036b32a4c..8b83319e3a4 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 4 end_line: 4 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -20,6 +21,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 22 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho 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 87ba5702211..8dcfb3056cd 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 17 end_line: 28 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho 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 2e04ccd95e6..22f7d10b500 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 @@ -15,6 +15,7 @@ other_license_detections: - score: '100.0' start_line: 23 end_line: 23 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -26,6 +27,7 @@ other_license_detections: - score: '100.0' start_line: 24 end_line: 25 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -42,6 +44,7 @@ other_license_detections: - score: '99.0' start_line: 13 end_line: 13 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash 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 e671c87c013..986a6ca062b 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,6 +14,7 @@ license_detections: - score: '100.0' start_line: 13 end_line: 26 + from_file: matched_length: 118 match_coverage: '100.0' matcher: 2-aho @@ -39,6 +40,7 @@ license_detections: - score: '100.0' start_line: 28 end_line: 34 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -57,6 +59,7 @@ license_detections: - score: '100.0' start_line: 37 end_line: 37 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -71,6 +74,7 @@ license_detections: - score: '100.0' start_line: 44 end_line: 48 + from_file: matched_length: 45 match_coverage: '100.0' matcher: 2-aho @@ -90,6 +94,7 @@ license_detections: - score: '100.0' start_line: 55 end_line: 64 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -114,6 +119,7 @@ license_detections: - score: '100.0' start_line: 71 end_line: 76 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 2-aho @@ -134,6 +140,7 @@ license_detections: - score: '100.0' start_line: 82 end_line: 84 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -148,6 +155,7 @@ license_detections: - score: '99.0' start_line: 86 end_line: 99 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -176,6 +184,7 @@ license_detections: - score: '99.0' start_line: 108 end_line: 124 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 2-aho @@ -207,6 +216,7 @@ license_detections: - score: '100.0' start_line: 132 end_line: 137 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 2-aho @@ -227,6 +237,7 @@ license_detections: - score: '99.0' start_line: 144 end_line: 160 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 2-aho @@ -258,6 +269,7 @@ license_detections: - score: '100.0' start_line: 168 end_line: '194' + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -296,6 +308,7 @@ license_detections: - score: '100.0' start_line: '198' end_line: 212 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -325,6 +338,7 @@ license_detections: - score: '100.0' start_line: 220 end_line: 223 + from_file: matched_length: 28 match_coverage: '100.0' matcher: 2-aho 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 3ac8842261c..419c528ac2c 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 @@ -13,6 +13,7 @@ license_detections: - score: '81.1' start_line: 22 end_line: 41 + from_file: matched_length: 103 match_coverage: '81.1' matcher: 3-seq @@ -47,6 +48,7 @@ license_detections: - score: '100.0' start_line: 47 end_line: 69 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -84,6 +86,7 @@ license_detections: - score: '100.0' start_line: 78 end_line: 89 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -110,6 +113,7 @@ license_detections: - score: '100.0' start_line: 95 end_line: 117 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -147,6 +151,7 @@ license_detections: - score: '100.0' start_line: 126 end_line: 137 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -173,6 +178,7 @@ license_detections: - score: '100.0' start_line: 145 end_line: 157 + from_file: matched_length: 110 match_coverage: '100.0' matcher: 2-aho @@ -200,6 +206,7 @@ license_detections: - score: '100.0' start_line: 162 end_line: 173 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -226,6 +233,7 @@ license_detections: - score: '100.0' start_line: 180 end_line: 182 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 2-aho @@ -243,6 +251,7 @@ license_detections: - score: '75.18' start_line: '193' end_line: 214 + from_file: matched_length: 106 match_coverage: '75.18' matcher: 3-seq @@ -276,6 +285,7 @@ license_detections: - score: '100.0' start_line: 213 end_line: 224 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -302,6 +312,7 @@ license_detections: - score: '100.0' start_line: 233 end_line: 244 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -328,6 +339,7 @@ license_detections: - score: '100.0' start_line: 253 end_line: 264 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -354,6 +366,7 @@ license_detections: - score: '100.0' start_line: 272 end_line: 277 + from_file: matched_length: 62 match_coverage: '100.0' matcher: 2-aho @@ -374,6 +387,7 @@ license_detections: - score: '100.0' start_line: 285 end_line: 299 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 2-aho 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 a1e8608fa2d..f3043fd060d 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 @@ -51,6 +51,7 @@ other_license_detections: - score: '100.0' start_line: 155 end_line: 177 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +89,7 @@ other_license_detections: - score: '100.0' start_line: 180 end_line: 181 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -104,6 +106,7 @@ other_license_detections: - score: '100.0' start_line: 184 end_line: '191' + from_file: matched_length: 63 match_coverage: '100.0' matcher: 1-hash @@ -126,6 +129,7 @@ other_license_detections: - score: '100.0' start_line: '194' end_line: 214 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 2-aho @@ -158,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: 216 end_line: 216 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -172,6 +177,7 @@ other_license_detections: - score: '100.0' start_line: 218 end_line: 218 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -183,6 +189,7 @@ other_license_detections: - score: '100.0' start_line: 219 end_line: 234 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '99.0' start_line: 138 end_line: 138 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash 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 6c1fe1cf3de..435d1375f77 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 @@ -26,6 +26,7 @@ other_license_detections: - score: '99.45' start_line: 59 end_line: 78 + from_file: matched_length: 182 match_coverage: '99.45' matcher: 3-seq 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 17d47eb837d..2445e3f05df 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 @@ -9,6 +9,7 @@ license_detections: - score: '90.0' start_line: 6 end_line: 26 + from_file: matched_length: 162 match_coverage: '100.0' matcher: 3-seq 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 57f53731671..b4a13068553 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 8 end_line: 11 + from_file: matched_length: 31 match_coverage: '100.0' matcher: 2-aho @@ -28,6 +29,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 161 + from_file: matched_length: 1227 match_coverage: '100.0' matcher: 2-aho 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 f30f0b2855f..15a8c790cb6 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 29 + from_file: matched_length: 100 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 44 + from_file: matched_length: 67 match_coverage: '100.0' matcher: 2-aho 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 04833158a3e..05049c67bad 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 @@ -25,6 +25,7 @@ other_license_detections: - score: '70.0' start_line: 102 end_line: 102 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -36,6 +37,7 @@ other_license_detections: - score: '100.0' start_line: 103 end_line: 104 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -49,6 +51,7 @@ other_license_detections: - score: '100.0' start_line: 106 end_line: 106 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -60,6 +63,7 @@ other_license_detections: - score: '100.0' start_line: 107 end_line: 108 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -73,6 +77,7 @@ other_license_detections: - score: '100.0' start_line: 111 end_line: 111 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -87,6 +92,7 @@ other_license_detections: - score: '100.0' start_line: 118 end_line: 120 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -104,6 +110,7 @@ other_license_detections: - score: '100.0' start_line: 127 end_line: 127 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -115,6 +122,7 @@ other_license_detections: - score: '100.0' start_line: 128 end_line: 139 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 1-hash @@ -138,6 +146,7 @@ other_license_detections: - score: '100.0' start_line: 141 end_line: 143 + from_file: matched_length: 31 match_coverage: '100.0' matcher: 1-hash @@ -155,6 +164,7 @@ other_license_detections: - score: '100.0' start_line: 145 end_line: 145 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -166,6 +176,7 @@ other_license_detections: - score: '100.0' start_line: 146 end_line: 156 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 1-hash @@ -191,6 +202,7 @@ other_license_detections: - score: '99.45' start_line: 159 end_line: 178 + from_file: matched_length: 182 match_coverage: '99.45' matcher: 3-seq 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 6ca09097ea4..2783592c4b5 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 @@ -11,6 +11,7 @@ license_detections: - score: '99.02' start_line: 17 end_line: 30 + from_file: matched_length: 101 match_coverage: '99.02' matcher: 3-seq @@ -33,6 +34,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 45 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -52,6 +54,7 @@ license_detections: - score: '100.0' start_line: 49 end_line: 73 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 64a0f5e6f19..51a79618474 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 @@ -9,6 +9,7 @@ license_detections: - score: '87.25' start_line: 49 end_line: 73 + from_file: matched_length: 130 match_coverage: '87.25' matcher: 3-seq @@ -45,6 +46,7 @@ license_detections: - score: '100.0' start_line: 71 end_line: 81 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho 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 f15e6631246..c4b4c21a667 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 @@ -44,6 +44,7 @@ license_detections: - score: '100.0' start_line: 83 end_line: 99 + from_file: matched_length: 133 match_coverage: '100.0' matcher: 2-aho @@ -72,6 +73,7 @@ license_detections: - score: '100.0' start_line: 101 end_line: 103 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho @@ -89,6 +91,7 @@ license_detections: - score: '100.0' start_line: 123 end_line: 149 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -119,6 +122,7 @@ license_detections: - score: '100.0' start_line: 167 end_line: '192' + from_file: matched_length: 224 match_coverage: '100.0' matcher: 2-aho @@ -156,6 +160,7 @@ license_detections: - score: '100.0' start_line: '194' end_line: 210 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -187,6 +192,7 @@ license_detections: - score: '100.0' start_line: 217 end_line: 234 + from_file: matched_length: 158 match_coverage: '100.0' matcher: 2-aho @@ -216,6 +222,7 @@ license_detections: - score: '100.0' start_line: 237 end_line: 239 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho @@ -230,6 +237,7 @@ license_detections: - score: '100.0' start_line: 242 end_line: 313 + from_file: matched_length: 512 match_coverage: '100.0' matcher: 2-aho @@ -316,6 +324,7 @@ license_detections: - score: '100.0' start_line: 322 end_line: 331 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -340,6 +349,7 @@ license_detections: - score: '100.0' start_line: 338 end_line: 346 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -363,6 +373,7 @@ license_detections: - score: '100.0' start_line: 356 end_line: 364 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -386,6 +397,7 @@ license_detections: - score: '100.0' start_line: 374 end_line: 382 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -409,6 +421,7 @@ license_detections: - score: '70.0' start_line: 387 end_line: 387 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -423,6 +436,7 @@ license_detections: - score: '100.0' start_line: 395 end_line: 403 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -446,6 +460,7 @@ license_detections: - score: '100.0' start_line: 410 end_line: 418 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -469,6 +484,7 @@ license_detections: - score: '100.0' start_line: 424 end_line: 427 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -487,6 +503,7 @@ license_detections: - score: '100.0' start_line: 434 end_line: 458 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -526,6 +543,7 @@ license_detections: - score: '100.0' start_line: 473 end_line: 480 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 2-aho @@ -548,6 +566,7 @@ license_detections: - score: '100.0' start_line: 490 end_line: 495 + from_file: matched_length: 46 match_coverage: '100.0' matcher: 2-aho @@ -568,6 +587,7 @@ license_detections: - score: '100.0' start_line: 503 end_line: 517 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho @@ -597,6 +617,7 @@ license_detections: - score: '100.0' start_line: 529 end_line: 545 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 2-aho @@ -628,6 +649,7 @@ license_detections: - score: '100.0' start_line: 557 end_line: 574 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -660,6 +682,7 @@ license_detections: - score: '100.0' start_line: 581 end_line: 598 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 2-aho @@ -692,6 +715,7 @@ license_detections: - score: '100.0' start_line: 609 end_line: 617 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -715,6 +739,7 @@ license_detections: - score: '100.0' start_line: 623 end_line: 626 + from_file: matched_length: 46 match_coverage: '100.0' matcher: 2-aho @@ -733,6 +758,7 @@ license_detections: - score: '100.0' start_line: 635 end_line: 647 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho @@ -757,6 +783,7 @@ license_detections: - score: '100.0' start_line: 650 end_line: 651 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -774,6 +801,7 @@ license_detections: - score: '100.0' start_line: 663 end_line: 663 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -785,6 +813,7 @@ license_detections: - score: '100.0' start_line: 666 end_line: 666 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -796,6 +825,7 @@ license_detections: - score: '100.0' start_line: 670 end_line: 670 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -807,6 +837,7 @@ license_detections: - score: '100.0' start_line: 673 end_line: 673 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -818,6 +849,7 @@ license_detections: - score: '100.0' start_line: 676 end_line: 682 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 2-aho @@ -836,6 +868,7 @@ license_detections: - score: '100.0' start_line: 686 end_line: 686 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -847,6 +880,7 @@ license_detections: - score: '100.0' start_line: 690 end_line: 690 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -861,6 +895,7 @@ license_detections: - score: '100.0' start_line: 701 end_line: 713 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho @@ -888,6 +923,7 @@ license_detections: - score: '100.0' start_line: 739 end_line: 745 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 2-aho @@ -909,6 +945,7 @@ license_detections: - score: '100.0' start_line: 754 end_line: 764 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho @@ -931,6 +968,7 @@ license_detections: - score: '100.0' start_line: 771 end_line: 781 + from_file: matched_length: 101 match_coverage: '100.0' matcher: 2-aho @@ -956,6 +994,7 @@ license_detections: - score: '100.0' start_line: 789 end_line: 815 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -997,6 +1036,7 @@ license_detections: - score: '100.0' start_line: 822 end_line: 844 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1034,6 +1074,7 @@ license_detections: - score: '100.0' start_line: 856 end_line: 882 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1075,6 +1116,7 @@ license_detections: - score: '100.0' start_line: 889 end_line: 901 + from_file: matched_length: 122 match_coverage: '100.0' matcher: 2-aho @@ -1102,6 +1144,7 @@ license_detections: - score: '100.0' start_line: 909 end_line: 909 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -1117,6 +1160,7 @@ license_detections: - score: '100.0' start_line: 919 end_line: 921 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 2-aho @@ -1135,6 +1179,7 @@ license_detections: - score: '100.0' start_line: 929 end_line: 938 + from_file: matched_length: 93 match_coverage: '100.0' matcher: 2-aho @@ -1159,6 +1204,7 @@ license_detections: - score: '100.0' start_line: 944 end_line: 955 + from_file: matched_length: 98 match_coverage: '100.0' matcher: 2-aho @@ -1185,6 +1231,7 @@ license_detections: - score: '100.0' start_line: 983 end_line: 986 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -1201,6 +1248,7 @@ license_detections: - score: '100.0' start_line: 992 end_line: 1001 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -1225,6 +1273,7 @@ license_detections: - score: '100.0' start_line: 1007 end_line: 1014 + from_file: matched_length: 55 match_coverage: '100.0' matcher: 2-aho @@ -1247,6 +1296,7 @@ license_detections: - score: '100.0' start_line: 1020 end_line: 1028 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 2-aho @@ -1270,6 +1320,7 @@ license_detections: - score: '100.0' start_line: 1035 end_line: 1055 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -1305,6 +1356,7 @@ license_detections: - score: '95.0' start_line: 1061 end_line: 1072 + from_file: matched_length: 95 match_coverage: '100.0' matcher: 2-aho @@ -1326,6 +1378,7 @@ license_detections: - score: '100.0' start_line: 1087 end_line: 1112 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -1366,6 +1419,7 @@ license_detections: - score: '100.0' start_line: 1119 end_line: 1138 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1400,6 +1454,7 @@ license_detections: - score: '100.0' start_line: 1145 end_line: 1164 + from_file: matched_length: 181 match_coverage: '100.0' matcher: 2-aho @@ -1434,6 +1489,7 @@ license_detections: - score: '100.0' start_line: 1171 end_line: 1190 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1468,6 +1524,7 @@ license_detections: - score: '99.0' start_line: 1198 end_line: 1207 + from_file: matched_length: 89 match_coverage: '100.0' matcher: 2-aho @@ -1492,6 +1549,7 @@ license_detections: - score: '100.0' start_line: 1214 end_line: 1233 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1526,6 +1584,7 @@ license_detections: - score: '100.0' start_line: 1240 end_line: 1260 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 2-aho @@ -1561,6 +1620,7 @@ license_detections: - score: '100.0' start_line: 1274 end_line: 1274 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1575,6 +1635,7 @@ license_detections: - score: '100.0' start_line: 1281 end_line: 1294 + from_file: matched_length: 123 match_coverage: '100.0' matcher: 2-aho @@ -1600,6 +1661,7 @@ license_detections: - score: '99.0' start_line: 1296 end_line: 1296 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1611,6 +1673,7 @@ license_detections: - score: '100.0' start_line: 1300 end_line: 1308 + from_file: matched_length: 81 match_coverage: '100.0' matcher: 2-aho @@ -1631,6 +1694,7 @@ license_detections: - score: '100.0' start_line: 1314 end_line: 1336 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho @@ -1668,6 +1732,7 @@ license_detections: - score: '100.0' start_line: 1342 end_line: 1351 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -1692,6 +1757,7 @@ license_detections: - score: '100.0' start_line: 1356 end_line: 1374 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -1725,6 +1791,7 @@ license_detections: - score: '100.0' start_line: 1381 end_line: 1400 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1759,6 +1826,7 @@ license_detections: - score: '100.0' start_line: 1407 end_line: 1426 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1793,6 +1861,7 @@ license_detections: - score: '100.0' start_line: 1435 end_line: 1454 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1827,6 +1896,7 @@ license_detections: - score: '100.0' start_line: 1466 end_line: 1489 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho @@ -1858,6 +1928,7 @@ license_detections: - score: '100.0' start_line: 1494 end_line: 1511 + from_file: matched_length: 151 match_coverage: '100.0' matcher: 2-aho @@ -1887,6 +1958,7 @@ license_detections: - score: '100.0' start_line: 1513 end_line: 1543 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho @@ -1932,6 +2004,7 @@ license_detections: - score: '100.0' start_line: 1550 end_line: 1562 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho 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 fe8942e87b8..3a64ff00fac 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 @@ -50,6 +50,7 @@ license_detections: - score: '100.0' start_line: 83 end_line: 99 + from_file: matched_length: 133 match_coverage: '100.0' matcher: 2-aho @@ -78,6 +79,7 @@ license_detections: - score: '100.0' start_line: 101 end_line: 103 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho @@ -95,6 +97,7 @@ license_detections: - score: '100.0' start_line: 123 end_line: 149 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -125,6 +128,7 @@ license_detections: - score: '100.0' start_line: 167 end_line: '192' + from_file: matched_length: 224 match_coverage: '100.0' matcher: 2-aho @@ -162,6 +166,7 @@ license_detections: - score: '100.0' start_line: '194' end_line: 210 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -193,6 +198,7 @@ license_detections: - score: '100.0' start_line: 217 end_line: 234 + from_file: matched_length: 158 match_coverage: '100.0' matcher: 2-aho @@ -222,6 +228,7 @@ license_detections: - score: '100.0' start_line: 237 end_line: 239 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho @@ -236,6 +243,7 @@ license_detections: - score: '100.0' start_line: 242 end_line: 313 + from_file: matched_length: 512 match_coverage: '100.0' matcher: 2-aho @@ -322,6 +330,7 @@ license_detections: - score: '100.0' start_line: 322 end_line: 331 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -346,6 +355,7 @@ license_detections: - score: '100.0' start_line: 338 end_line: 346 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -369,6 +379,7 @@ license_detections: - score: '100.0' start_line: 356 end_line: 364 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -392,6 +403,7 @@ license_detections: - score: '100.0' start_line: 374 end_line: 382 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -415,6 +427,7 @@ license_detections: - score: '70.0' start_line: 387 end_line: 387 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -429,6 +442,7 @@ license_detections: - score: '100.0' start_line: 395 end_line: 403 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -452,6 +466,7 @@ license_detections: - score: '100.0' start_line: 410 end_line: 418 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -475,6 +490,7 @@ license_detections: - score: '100.0' start_line: 424 end_line: 427 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -493,6 +509,7 @@ license_detections: - score: '100.0' start_line: 434 end_line: 458 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -532,6 +549,7 @@ license_detections: - score: '100.0' start_line: 473 end_line: 480 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 2-aho @@ -554,6 +572,7 @@ license_detections: - score: '100.0' start_line: 490 end_line: 495 + from_file: matched_length: 46 match_coverage: '100.0' matcher: 2-aho @@ -574,6 +593,7 @@ license_detections: - score: '100.0' start_line: 503 end_line: 517 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho @@ -603,6 +623,7 @@ license_detections: - score: '100.0' start_line: 529 end_line: 545 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 2-aho @@ -634,6 +655,7 @@ license_detections: - score: '100.0' start_line: 557 end_line: 574 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -666,6 +688,7 @@ license_detections: - score: '100.0' start_line: 581 end_line: 598 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 2-aho @@ -698,6 +721,7 @@ license_detections: - score: '100.0' start_line: 606 end_line: 614 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -721,6 +745,7 @@ license_detections: - score: '100.0' start_line: 620 end_line: 623 + from_file: matched_length: 46 match_coverage: '100.0' matcher: 2-aho @@ -739,6 +764,7 @@ license_detections: - score: '100.0' start_line: 629 end_line: 637 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -762,6 +788,7 @@ license_detections: - score: '100.0' start_line: 643 end_line: 646 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 2-aho @@ -780,6 +807,7 @@ license_detections: - score: '100.0' start_line: 661 end_line: 669 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -803,6 +831,7 @@ license_detections: - score: '100.0' start_line: 675 end_line: 683 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -826,6 +855,7 @@ license_detections: - score: '100.0' start_line: 705 end_line: 713 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -849,6 +879,7 @@ license_detections: - score: '100.0' start_line: 728 end_line: 736 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -869,6 +900,7 @@ license_detections: - score: '95.0' start_line: 739 end_line: 739 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +915,7 @@ license_detections: - score: '100.0' start_line: 757 end_line: 765 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -906,6 +939,7 @@ license_detections: - score: '100.0' start_line: 771 end_line: 779 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -930,6 +964,7 @@ license_detections: - score: '100.0' start_line: 785 end_line: 793 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -950,6 +985,7 @@ license_detections: - score: '100.0' start_line: 797 end_line: 797 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -961,6 +997,7 @@ license_detections: - score: '100.0' start_line: 801 end_line: 801 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -972,6 +1009,7 @@ license_detections: - score: '100.0' start_line: 805 end_line: 805 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -983,6 +1021,7 @@ license_detections: - score: '100.0' start_line: 809 end_line: 809 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -994,6 +1033,7 @@ license_detections: - score: '100.0' start_line: 812 end_line: 812 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1005,6 +1045,7 @@ license_detections: - score: '100.0' start_line: 815 end_line: 821 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 2-aho @@ -1026,6 +1067,7 @@ license_detections: - score: '100.0' start_line: 826 end_line: 826 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -1037,6 +1079,7 @@ license_detections: - score: '100.0' start_line: 830 end_line: 830 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -1052,6 +1095,7 @@ license_detections: - score: '100.0' start_line: 837 end_line: 845 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 2-aho @@ -1072,6 +1116,7 @@ license_detections: - score: '100.0' start_line: 849 end_line: 849 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -1083,6 +1128,7 @@ license_detections: - score: '100.0' start_line: 853 end_line: 853 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -1094,6 +1140,7 @@ license_detections: - score: '100.0' start_line: 857 end_line: 866 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -1118,6 +1165,7 @@ license_detections: - score: '100.0' start_line: 872 end_line: 880 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -1141,6 +1189,7 @@ license_detections: - score: '100.0' start_line: 886 end_line: 894 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -1164,6 +1213,7 @@ license_detections: - score: '100.0' start_line: 899 end_line: 907 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -1187,6 +1237,7 @@ license_detections: - score: '100.0' start_line: 913 end_line: 921 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho @@ -1210,6 +1261,7 @@ license_detections: - score: '100.0' start_line: 947 end_line: 953 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 2-aho @@ -1231,6 +1283,7 @@ license_detections: - score: '100.0' start_line: 962 end_line: 972 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho @@ -1253,6 +1306,7 @@ license_detections: - score: '100.0' start_line: 979 end_line: 989 + from_file: matched_length: 101 match_coverage: '100.0' matcher: 2-aho @@ -1278,6 +1332,7 @@ license_detections: - score: '100.0' start_line: 997 end_line: 1023 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1319,6 +1374,7 @@ license_detections: - score: '100.0' start_line: 1030 end_line: 1052 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1356,6 +1412,7 @@ license_detections: - score: '100.0' start_line: 1064 end_line: 1090 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1397,6 +1454,7 @@ license_detections: - score: '100.0' start_line: 1097 end_line: 1109 + from_file: matched_length: 122 match_coverage: '100.0' matcher: 2-aho @@ -1424,6 +1482,7 @@ license_detections: - score: '100.0' start_line: 1117 end_line: 1117 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -1439,6 +1498,7 @@ license_detections: - score: '100.0' start_line: 1127 end_line: 1129 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 2-aho @@ -1457,6 +1517,7 @@ license_detections: - score: '100.0' start_line: 1137 end_line: 1146 + from_file: matched_length: 93 match_coverage: '100.0' matcher: 2-aho @@ -1481,6 +1542,7 @@ license_detections: - score: '100.0' start_line: 1152 end_line: 1163 + from_file: matched_length: 98 match_coverage: '100.0' matcher: 2-aho @@ -1507,6 +1569,7 @@ license_detections: - score: '100.0' start_line: 1191 end_line: 1194 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -1523,6 +1586,7 @@ license_detections: - score: '100.0' start_line: 1200 end_line: 1209 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -1547,6 +1611,7 @@ license_detections: - score: '100.0' start_line: 1215 end_line: 1222 + from_file: matched_length: 55 match_coverage: '100.0' matcher: 2-aho @@ -1569,6 +1634,7 @@ license_detections: - score: '100.0' start_line: 1228 end_line: 1236 + from_file: matched_length: 92 match_coverage: '100.0' matcher: 2-aho @@ -1592,6 +1658,7 @@ license_detections: - score: '100.0' start_line: 1243 end_line: 1263 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -1627,6 +1694,7 @@ license_detections: - score: '95.0' start_line: 1269 end_line: 1280 + from_file: matched_length: 95 match_coverage: '100.0' matcher: 2-aho @@ -1648,6 +1716,7 @@ license_detections: - score: '100.0' start_line: 1295 end_line: 1320 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -1688,6 +1757,7 @@ license_detections: - score: '100.0' start_line: 1327 end_line: 1346 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1722,6 +1792,7 @@ license_detections: - score: '100.0' start_line: 1353 end_line: 1372 + from_file: matched_length: 181 match_coverage: '100.0' matcher: 2-aho @@ -1756,6 +1827,7 @@ license_detections: - score: '100.0' start_line: 1379 end_line: 1398 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1790,6 +1862,7 @@ license_detections: - score: '99.0' start_line: 1406 end_line: 1415 + from_file: matched_length: 89 match_coverage: '100.0' matcher: 2-aho @@ -1814,6 +1887,7 @@ license_detections: - score: '100.0' start_line: 1422 end_line: 1441 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -1848,6 +1922,7 @@ license_detections: - score: '100.0' start_line: 1448 end_line: 1468 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 2-aho @@ -1883,6 +1958,7 @@ license_detections: - score: '100.0' start_line: 1482 end_line: 1482 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1897,6 +1973,7 @@ license_detections: - score: '100.0' start_line: 1489 end_line: 1502 + from_file: matched_length: 123 match_coverage: '100.0' matcher: 2-aho @@ -1922,6 +1999,7 @@ license_detections: - score: '99.0' start_line: 1504 end_line: 1504 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1933,6 +2011,7 @@ license_detections: - score: '100.0' start_line: 1508 end_line: 1516 + from_file: matched_length: 81 match_coverage: '100.0' matcher: 2-aho @@ -1953,6 +2032,7 @@ license_detections: - score: '100.0' start_line: 1522 end_line: 1544 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho @@ -1990,6 +2070,7 @@ license_detections: - score: '100.0' start_line: 1550 end_line: 1559 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -2014,6 +2095,7 @@ license_detections: - score: '100.0' start_line: 1564 end_line: 1582 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -2047,6 +2129,7 @@ license_detections: - score: '100.0' start_line: 1589 end_line: 1608 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -2081,6 +2164,7 @@ license_detections: - score: '100.0' start_line: 1615 end_line: 1634 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -2115,6 +2199,7 @@ license_detections: - score: '100.0' start_line: 1643 end_line: 1662 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -2149,6 +2234,7 @@ license_detections: - score: '100.0' start_line: 1674 end_line: 1697 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho 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 83288651758..1de59f708e3 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 @@ -42,6 +42,7 @@ other_license_detections: - score: '99.05' start_line: 85 end_line: 110 + from_file: matched_length: 209 match_coverage: '100.0' matcher: 1-hash @@ -82,6 +83,7 @@ other_license_detections: - score: '100.0' start_line: 114 end_line: 121 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 1-hash @@ -104,6 +106,7 @@ other_license_detections: - score: '90.0' start_line: 129 end_line: 144 + from_file: matched_length: 149 match_coverage: '100.0' matcher: 2-aho @@ -134,6 +137,7 @@ other_license_detections: - score: '100.0' start_line: 147 end_line: 147 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -145,6 +149,7 @@ other_license_detections: - score: '100.0' start_line: 148 end_line: 163 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -175,6 +180,7 @@ other_license_detections: - score: '100.0' start_line: 165 end_line: 165 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -186,6 +192,7 @@ other_license_detections: - score: '100.0' start_line: 166 end_line: 181 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -216,6 +223,7 @@ other_license_detections: - score: '100.0' start_line: 183 end_line: 183 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -227,6 +235,7 @@ other_license_detections: - score: '100.0' start_line: 184 end_line: '199' + from_file: matched_length: 135 match_coverage: '100.0' matcher: 1-hash @@ -257,6 +266,7 @@ other_license_detections: - score: '100.0' start_line: 202 end_line: 225 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 1-hash @@ -295,6 +305,7 @@ other_license_detections: - score: '100.0' start_line: 228 end_line: 245 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -327,6 +338,7 @@ other_license_detections: - score: '100.0' start_line: 247 end_line: 247 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -338,6 +350,7 @@ other_license_detections: - score: '100.0' start_line: 248 end_line: 253 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 1-hash @@ -358,6 +371,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 81 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho 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 901afcd1cbb..83cec02feaa 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 @@ -14,6 +14,7 @@ other_license_detections: - score: '100.0' start_line: 23 end_line: 23 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -25,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 27 end_line: 45 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 2-aho 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 1bb8edf80da..099a8850800 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 @@ -19,6 +19,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 25 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -30,6 +31,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 40 + from_file: matched_length: 123 match_coverage: '100.0' matcher: 1-hash @@ -59,6 +61,7 @@ other_license_detections: - score: '100.0' start_line: 43 end_line: 50 + from_file: matched_length: 72 match_coverage: '100.0' matcher: 1-hash @@ -81,6 +84,7 @@ other_license_detections: - score: '85.0' start_line: 53 end_line: 70 + from_file: matched_length: 138 match_coverage: '100.0' matcher: 1-hash 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 685b0be0bc1..4c839ac4a1c 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 12 end_line: 26 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 2-aho 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 752bf6377b8..0a8141435f7 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 @@ -19,6 +19,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 25 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -30,6 +31,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 41 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -60,6 +62,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 70 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho 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 8cbd5b4d99b..467802477e2 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 @@ -14,6 +14,7 @@ other_license_detections: - score: '100.0' start_line: 8 end_line: 8 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -25,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 9 end_line: 20 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 1-hash @@ -48,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -64,6 +67,7 @@ other_license_detections: - score: '100.0' start_line: 39 end_line: 39 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +79,7 @@ other_license_detections: - score: '100.0' start_line: 40 end_line: 51 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -101,6 +106,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -117,6 +123,7 @@ other_license_detections: - score: '100.0' start_line: 53 end_line: 54 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash 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 b2036b32a4c..8b83319e3a4 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 4 end_line: 4 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -20,6 +21,7 @@ license_detections: - score: '100.0' start_line: 6 end_line: 22 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho 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 96bee13204c..4bd89cb57bb 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 @@ -14,6 +14,7 @@ other_license_detections: - score: '100.0' start_line: 8 end_line: 8 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -25,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 9 end_line: 20 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 1-hash @@ -48,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -64,6 +67,7 @@ other_license_detections: - score: '100.0' start_line: 32 end_line: 32 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +79,7 @@ other_license_detections: - score: '100.0' start_line: 33 end_line: 44 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -101,6 +106,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 23 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -117,6 +123,7 @@ other_license_detections: - score: '100.0' start_line: 46 end_line: 47 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash 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 3e23a894686..ec3541abecb 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 @@ -17,6 +17,7 @@ other_license_detections: - score: '100.0' start_line: 16 end_line: 16 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -28,6 +29,7 @@ other_license_detections: - score: '97.44' start_line: 17 end_line: 21 + from_file: matched_length: 38 match_coverage: '100.0' matcher: 2-aho @@ -47,6 +49,7 @@ other_license_detections: - score: '100.0' start_line: 28 end_line: 28 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -58,6 +61,7 @@ other_license_detections: - score: '99.0' start_line: 29 end_line: 43 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 1-hash 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 a934c837ce8..a82f12f1b87 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 @@ -12,6 +12,7 @@ other_license_detections: - score: '100.0' start_line: 8 end_line: 37 + from_file: matched_length: 233 match_coverage: '100.0' matcher: 1-hash @@ -56,6 +57,7 @@ other_license_detections: - score: '100.0' start_line: 46 end_line: 46 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -67,6 +69,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 48 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash 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 6ab7bdd6077..de7dcea1563 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 @@ -18,6 +18,7 @@ license_detections: - score: '100.0' start_line: 10 end_line: 26 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -49,6 +50,7 @@ license_detections: - score: '95.0' start_line: 33 end_line: 48 + from_file: matched_length: 135 match_coverage: '100.0' matcher: 2-aho @@ -76,6 +78,7 @@ license_detections: - score: '100.0' start_line: 50 end_line: 51 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +95,7 @@ license_detections: - score: '100.0' start_line: 56 end_line: 80 + from_file: matched_length: 218 match_coverage: '100.0' matcher: 2-aho @@ -131,6 +135,7 @@ license_detections: - score: '100.0' start_line: 88 end_line: 102 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -160,6 +165,7 @@ license_detections: - score: '100.0' start_line: 108 end_line: 119 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -186,6 +192,7 @@ license_detections: - score: '100.0' start_line: 126 end_line: 151 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 2-aho @@ -223,6 +230,7 @@ license_detections: - score: '100.0' start_line: 153 end_line: 179 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 2-aho @@ -261,6 +269,7 @@ license_detections: - score: '100.0' start_line: 181 end_line: 206 + from_file: matched_length: 219 match_coverage: '100.0' matcher: 2-aho @@ -298,6 +307,7 @@ license_detections: - score: '100.0' start_line: 208 end_line: 211 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -316,6 +326,7 @@ license_detections: - score: '100.0' start_line: 217 end_line: 242 + from_file: matched_length: 204 match_coverage: '100.0' matcher: 2-aho @@ -353,6 +364,7 @@ license_detections: - score: '100.0' start_line: 245 end_line: 280 + from_file: matched_length: 314 match_coverage: '100.0' matcher: 2-aho @@ -403,6 +415,7 @@ license_detections: - score: '100.0' start_line: 286 end_line: 289 + from_file: matched_length: 48 match_coverage: '100.0' matcher: 2-aho @@ -421,6 +434,7 @@ license_detections: - score: '100.0' start_line: 298 end_line: 309 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -444,6 +458,7 @@ license_detections: - score: '100.0' start_line: 313 end_line: 314 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -460,6 +475,7 @@ license_detections: - score: '100.0' start_line: 324 end_line: 332 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -480,6 +496,7 @@ license_detections: - score: '100.0' start_line: 336 end_line: 358 + from_file: matched_length: 209 match_coverage: '100.0' matcher: 2-aho @@ -517,6 +534,7 @@ license_detections: - score: '100.0' start_line: 365 end_line: 387 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -554,6 +572,7 @@ license_detections: - score: '100.0' start_line: 395 end_line: 409 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -583,6 +602,7 @@ license_detections: - score: '100.0' start_line: 414 end_line: 432 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -616,6 +636,7 @@ license_detections: - score: '95.0' start_line: 438 end_line: 473 + from_file: matched_length: 271 match_coverage: '100.0' matcher: 2-aho @@ -666,6 +687,7 @@ license_detections: - score: '100.0' start_line: 479 end_line: 482 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -684,6 +706,7 @@ license_detections: - score: '100.0' start_line: 488 end_line: 491 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -702,6 +725,7 @@ license_detections: - score: '100.0' start_line: 497 end_line: 509 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho 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 6ab7bdd6077..de7dcea1563 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 @@ -18,6 +18,7 @@ license_detections: - score: '100.0' start_line: 10 end_line: 26 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -49,6 +50,7 @@ license_detections: - score: '95.0' start_line: 33 end_line: 48 + from_file: matched_length: 135 match_coverage: '100.0' matcher: 2-aho @@ -76,6 +78,7 @@ license_detections: - score: '100.0' start_line: 50 end_line: 51 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +95,7 @@ license_detections: - score: '100.0' start_line: 56 end_line: 80 + from_file: matched_length: 218 match_coverage: '100.0' matcher: 2-aho @@ -131,6 +135,7 @@ license_detections: - score: '100.0' start_line: 88 end_line: 102 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -160,6 +165,7 @@ license_detections: - score: '100.0' start_line: 108 end_line: 119 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -186,6 +192,7 @@ license_detections: - score: '100.0' start_line: 126 end_line: 151 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 2-aho @@ -223,6 +230,7 @@ license_detections: - score: '100.0' start_line: 153 end_line: 179 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 2-aho @@ -261,6 +269,7 @@ license_detections: - score: '100.0' start_line: 181 end_line: 206 + from_file: matched_length: 219 match_coverage: '100.0' matcher: 2-aho @@ -298,6 +307,7 @@ license_detections: - score: '100.0' start_line: 208 end_line: 211 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -316,6 +326,7 @@ license_detections: - score: '100.0' start_line: 217 end_line: 242 + from_file: matched_length: 204 match_coverage: '100.0' matcher: 2-aho @@ -353,6 +364,7 @@ license_detections: - score: '100.0' start_line: 245 end_line: 280 + from_file: matched_length: 314 match_coverage: '100.0' matcher: 2-aho @@ -403,6 +415,7 @@ license_detections: - score: '100.0' start_line: 286 end_line: 289 + from_file: matched_length: 48 match_coverage: '100.0' matcher: 2-aho @@ -421,6 +434,7 @@ license_detections: - score: '100.0' start_line: 298 end_line: 309 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -444,6 +458,7 @@ license_detections: - score: '100.0' start_line: 313 end_line: 314 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -460,6 +475,7 @@ license_detections: - score: '100.0' start_line: 324 end_line: 332 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -480,6 +496,7 @@ license_detections: - score: '100.0' start_line: 336 end_line: 358 + from_file: matched_length: 209 match_coverage: '100.0' matcher: 2-aho @@ -517,6 +534,7 @@ license_detections: - score: '100.0' start_line: 365 end_line: 387 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -554,6 +572,7 @@ license_detections: - score: '100.0' start_line: 395 end_line: 409 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 2-aho @@ -583,6 +602,7 @@ license_detections: - score: '100.0' start_line: 414 end_line: 432 + from_file: matched_length: 147 match_coverage: '100.0' matcher: 2-aho @@ -616,6 +636,7 @@ license_detections: - score: '95.0' start_line: 438 end_line: 473 + from_file: matched_length: 271 match_coverage: '100.0' matcher: 2-aho @@ -666,6 +687,7 @@ license_detections: - score: '100.0' start_line: 479 end_line: 482 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -684,6 +706,7 @@ license_detections: - score: '100.0' start_line: 488 end_line: 491 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho @@ -702,6 +725,7 @@ license_detections: - score: '100.0' start_line: 497 end_line: 509 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho 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 ffd355c1340..a5628cab7e3 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 10 end_line: 27 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -29,6 +30,7 @@ license_detections: - score: '100.0' start_line: 30 end_line: 31 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -45,6 +47,7 @@ license_detections: - score: '100.0' start_line: 37 end_line: 38 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 2-aho 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 7f2954171d7..b9e5dad7fae 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 14 end_line: 24 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho 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 b3eb4628541..1294042ebed 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 @@ -22,6 +22,7 @@ license_detections: - score: '97.06' start_line: 14 end_line: 16 + from_file: matched_length: 33 match_coverage: '100.0' matcher: 2-aho @@ -39,6 +40,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 22 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -50,6 +52,7 @@ license_detections: - score: '100.0' start_line: 25 end_line: 25 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +64,7 @@ license_detections: - score: '100.0' start_line: 29 end_line: 29 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -72,6 +76,7 @@ license_detections: - score: '100.0' start_line: 33 end_line: 33 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -83,6 +88,7 @@ license_detections: - score: '100.0' start_line: 36 end_line: 36 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -94,6 +100,7 @@ license_detections: - score: '100.0' start_line: 40 end_line: 40 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -105,6 +112,7 @@ license_detections: - score: '100.0' start_line: 43 end_line: 43 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +124,7 @@ license_detections: - score: '100.0' start_line: 47 end_line: 47 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -127,6 +136,7 @@ license_detections: - score: '100.0' start_line: 50 end_line: 50 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -141,6 +151,7 @@ license_detections: - score: '100.0' start_line: 55 end_line: 55 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -155,6 +166,7 @@ license_detections: - score: '100.0' start_line: 61 end_line: 61 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -166,6 +178,7 @@ license_detections: - score: '100.0' start_line: 64 end_line: 64 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -177,6 +190,7 @@ license_detections: - score: '100.0' start_line: 67 end_line: 67 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -188,6 +202,7 @@ license_detections: - score: '100.0' start_line: 71 end_line: 71 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -199,6 +214,7 @@ license_detections: - score: '100.0' start_line: 74 end_line: 74 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -210,6 +226,7 @@ license_detections: - score: '100.0' start_line: 77 end_line: 77 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -221,6 +238,7 @@ license_detections: - score: '100.0' start_line: 80 end_line: 80 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -232,6 +250,7 @@ license_detections: - score: '100.0' start_line: 83 end_line: 83 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -243,6 +262,7 @@ license_detections: - score: '100.0' start_line: 86 end_line: 86 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -258,6 +278,7 @@ license_detections: - score: '99.0' start_line: 98 end_line: 98 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -269,6 +290,7 @@ license_detections: - score: '100.0' start_line: 101 end_line: 101 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -280,6 +302,7 @@ license_detections: - score: '100.0' start_line: 104 end_line: 104 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -291,6 +314,7 @@ license_detections: - score: '100.0' start_line: 107 end_line: 107 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -302,6 +326,7 @@ license_detections: - score: '100.0' start_line: 111 end_line: 111 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -313,6 +338,7 @@ license_detections: - score: '100.0' start_line: 114 end_line: 114 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -324,6 +350,7 @@ license_detections: - score: '99.0' start_line: 118 end_line: 118 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -335,6 +362,7 @@ license_detections: - score: '100.0' start_line: 121 end_line: 121 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -346,6 +374,7 @@ license_detections: - score: '100.0' start_line: 124 end_line: 124 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -357,6 +386,7 @@ license_detections: - score: '99.0' start_line: 128 end_line: 128 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -368,6 +398,7 @@ license_detections: - score: '100.0' start_line: 131 end_line: 131 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -379,6 +410,7 @@ license_detections: - score: '100.0' start_line: 134 end_line: 134 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -390,6 +422,7 @@ license_detections: - score: '100.0' start_line: 137 end_line: 139 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho 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 54951e72331..78bd00025cf 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 5 end_line: 12 + from_file: matched_length: 61 match_coverage: '100.0' matcher: 2-aho @@ -32,6 +33,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 47 + from_file: matched_length: 283 match_coverage: '100.0' matcher: 2-aho @@ -76,6 +78,7 @@ license_detections: - score: '100.0' start_line: 53 end_line: 75 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -113,6 +116,7 @@ license_detections: - score: '100.0' start_line: 81 end_line: 103 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -150,6 +154,7 @@ license_detections: - score: '100.0' start_line: 111 end_line: 133 + from_file: matched_length: 216 match_coverage: '100.0' matcher: 2-aho 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 dfd226fa4fc..128179137bc 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 17 end_line: 17 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -23,6 +24,7 @@ license_detections: - score: '100.0' start_line: 22 end_line: 41 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho 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 6ca09097ea4..2783592c4b5 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 @@ -11,6 +11,7 @@ license_detections: - score: '99.02' start_line: 17 end_line: 30 + from_file: matched_length: 101 match_coverage: '99.02' matcher: 3-seq @@ -33,6 +34,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 45 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -52,6 +54,7 @@ license_detections: - score: '100.0' start_line: 49 end_line: 73 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 ccebc74c6cf..c189192ae0e 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 42 end_line: 59 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -38,6 +39,7 @@ license_detections: - score: '79.17' start_line: 62 end_line: 70 + from_file: matched_length: 57 match_coverage: '79.17' matcher: 3-seq @@ -58,6 +60,7 @@ license_detections: - score: '100.0' start_line: 69 end_line: 76 + from_file: matched_length: 72 match_coverage: '100.0' matcher: 2-aho @@ -77,6 +80,7 @@ license_detections: - score: '100.0' start_line: 79 end_line: 79 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho 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 4c5feb17214..151b3db1228 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 @@ -22,6 +22,7 @@ license_detections: - score: '100.0' start_line: 210 end_line: 211 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -35,6 +36,7 @@ license_detections: - score: '100.0' start_line: 215 end_line: 215 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -46,6 +48,7 @@ license_detections: - score: '100.0' start_line: 218 end_line: 218 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -57,6 +60,7 @@ license_detections: - score: '100.0' start_line: 222 end_line: 228 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho @@ -75,6 +79,7 @@ license_detections: - score: '100.0' start_line: 231 end_line: 236 + from_file: matched_length: 41 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +97,7 @@ license_detections: - score: '100.0' start_line: 240 end_line: 260 + from_file: matched_length: '194' match_coverage: '100.0' matcher: 2-aho @@ -124,6 +130,7 @@ license_detections: - score: '100.0' start_line: 262 end_line: 262 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -138,6 +145,7 @@ license_detections: - score: '100.0' start_line: 270 end_line: 286 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 2-aho @@ -166,6 +174,7 @@ license_detections: - score: '100.0' start_line: 288 end_line: 288 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -180,6 +189,7 @@ license_detections: - score: '100.0' start_line: 294 end_line: 298 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -199,6 +209,7 @@ license_detections: - score: '100.0' start_line: 307 end_line: 308 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -215,6 +226,7 @@ license_detections: - score: '100.0' start_line: 315 end_line: 315 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -229,6 +241,7 @@ license_detections: - score: '100.0' start_line: 330 end_line: 357 + from_file: matched_length: 209 match_coverage: '100.0' matcher: 2-aho @@ -271,6 +284,7 @@ license_detections: - score: '100.0' start_line: 372 end_line: 402 + from_file: matched_length: 260 match_coverage: '100.0' matcher: 2-aho @@ -316,6 +330,7 @@ license_detections: - score: '100.0' start_line: 413 end_line: 433 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 2-aho @@ -348,6 +363,7 @@ license_detections: - score: '70.0' start_line: 436 end_line: 436 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -362,6 +378,7 @@ license_detections: - score: '100.0' start_line: 443 end_line: 444 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -375,6 +392,7 @@ license_detections: - score: '99.0' start_line: 447 end_line: 447 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -389,6 +407,7 @@ license_detections: - score: '100.0' start_line: 453 end_line: 457 + from_file: matched_length: 47 match_coverage: '100.0' matcher: 2-aho @@ -405,6 +424,7 @@ license_detections: - score: '100.0' start_line: 459 end_line: 466 + from_file: matched_length: 55 match_coverage: '100.0' matcher: 2-aho @@ -424,6 +444,7 @@ license_detections: - score: '100.0' start_line: 470 end_line: 540 + from_file: matched_length: 602 match_coverage: '100.0' matcher: 2-aho @@ -509,6 +530,7 @@ license_detections: - score: '100.0' start_line: 545 end_line: 546 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho 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 62ac3af4e08..61c59a64909 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 @@ -11,6 +11,7 @@ license_detections: - score: '100.0' start_line: '19' end_line: 46 + from_file: matched_length: '198' match_coverage: '100.0' matcher: 2-aho @@ -53,6 +54,7 @@ license_detections: - score: '100.0' start_line: 52 end_line: 55 + from_file: matched_length: 38 match_coverage: '100.0' matcher: 2-aho @@ -68,6 +70,7 @@ license_detections: - score: '100.0' start_line: 57 end_line: 58 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho 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 449d227f9c7..b320b15f174 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,6 +55,7 @@ license_detections: - score: '100.0' start_line: 221 end_line: 233 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 2-aho @@ -82,6 +83,7 @@ license_detections: - score: '100.0' start_line: 244 end_line: 255 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -108,6 +110,7 @@ license_detections: - score: '100.0' start_line: 265 end_line: 276 + from_file: matched_length: 102 match_coverage: '100.0' matcher: 2-aho @@ -131,6 +134,7 @@ license_detections: - score: '100.0' start_line: 280 end_line: 281 + from_file: matched_length: 14 match_coverage: '100.0' matcher: 2-aho @@ -147,6 +151,7 @@ license_detections: - score: '100.0' start_line: 286 end_line: 291 + from_file: matched_length: 60 match_coverage: '100.0' matcher: 2-aho @@ -167,6 +172,7 @@ license_detections: - score: '100.0' start_line: 321 end_line: 327 + from_file: matched_length: 77 match_coverage: '100.0' matcher: 2-aho @@ -188,6 +194,7 @@ license_detections: - score: '100.0' start_line: 336 end_line: 337 + from_file: matched_length: 14 match_coverage: '100.0' matcher: 2-aho @@ -201,6 +208,7 @@ license_detections: - score: '100.0' start_line: 340 end_line: 342 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -218,6 +226,7 @@ license_detections: - score: '100.0' start_line: 347 end_line: 347 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -229,6 +238,7 @@ license_detections: - score: '100.0' start_line: 349 end_line: 349 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -243,6 +253,7 @@ license_detections: - score: '100.0' start_line: 370 end_line: 402 + from_file: matched_length: 252 match_coverage: '100.0' matcher: 2-aho @@ -290,6 +301,7 @@ license_detections: - score: '100.0' start_line: 417 end_line: 435 + from_file: matched_length: 179 match_coverage: '100.0' matcher: 2-aho @@ -323,6 +335,7 @@ license_detections: - score: '99.0' start_line: 446 end_line: 447 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -339,6 +352,7 @@ license_detections: - score: '100.0' start_line: 458 end_line: 469 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -365,6 +379,7 @@ license_detections: - score: '100.0' start_line: 476 end_line: 504 + from_file: matched_length: 984 match_coverage: '100.0' matcher: 2-aho @@ -410,6 +425,7 @@ license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -421,6 +437,7 @@ license_detections: - score: '100.0' start_line: 511 end_line: 527 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -452,6 +469,7 @@ license_detections: - score: '100.0' start_line: 533 end_line: 543 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -474,6 +492,7 @@ license_detections: - score: '100.0' start_line: 546 end_line: 548 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -491,6 +510,7 @@ license_detections: - score: '100.0' start_line: 556 end_line: 556 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -505,6 +525,7 @@ license_detections: - score: '100.0' start_line: 564 end_line: 566 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -522,6 +543,7 @@ license_detections: - score: '100.0' start_line: 572 end_line: 585 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -550,6 +572,7 @@ license_detections: - score: '100.0' start_line: 591 end_line: 604 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -578,6 +601,7 @@ license_detections: - score: '100.0' start_line: 610 end_line: 611 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -591,6 +615,7 @@ license_detections: - score: '100.0' start_line: 612 end_line: 614 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -608,6 +633,7 @@ license_detections: - score: '100.0' start_line: 619 end_line: 619 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -619,6 +645,7 @@ license_detections: - score: '100.0' start_line: 620 end_line: 636 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -650,6 +677,7 @@ license_detections: - score: '100.0' start_line: 645 end_line: 645 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -661,6 +689,7 @@ license_detections: - score: '100.0' start_line: 646 end_line: 662 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -692,6 +721,7 @@ license_detections: - score: '100.0' start_line: 667 end_line: 667 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -703,6 +733,7 @@ license_detections: - score: '100.0' start_line: 668 end_line: 684 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -731,6 +762,7 @@ license_detections: - score: '100.0' start_line: 688 end_line: 688 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -745,6 +777,7 @@ license_detections: - score: '100.0' start_line: 695 end_line: 695 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -756,6 +789,7 @@ license_detections: - score: '100.0' start_line: 699 end_line: 699 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -770,6 +804,7 @@ license_detections: - score: '100.0' start_line: 705 end_line: 705 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -781,6 +816,7 @@ license_detections: - score: '100.0' start_line: 706 end_line: 723 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -813,6 +849,7 @@ license_detections: - score: '100.0' start_line: 729 end_line: 729 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -827,6 +864,7 @@ license_detections: - score: '100.0' start_line: 735 end_line: 735 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -841,6 +879,7 @@ license_detections: - score: '100.0' start_line: 741 end_line: 741 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -852,6 +891,7 @@ license_detections: - score: '100.0' start_line: 745 end_line: 745 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -863,6 +903,7 @@ license_detections: - score: '100.0' start_line: 749 end_line: 749 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -874,6 +915,7 @@ license_detections: - score: '100.0' start_line: 753 end_line: 753 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -888,6 +930,7 @@ license_detections: - score: '100.0' start_line: 759 end_line: 759 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -902,6 +945,7 @@ license_detections: - score: '100.0' start_line: 764 end_line: 764 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -913,6 +957,7 @@ license_detections: - score: '100.0' start_line: 768 end_line: 768 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -924,6 +969,7 @@ license_detections: - score: '100.0' start_line: 772 end_line: 772 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -935,6 +981,7 @@ license_detections: - score: '100.0' start_line: 776 end_line: 776 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -946,6 +993,7 @@ license_detections: - score: '100.0' start_line: 780 end_line: 780 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -960,6 +1008,7 @@ license_detections: - score: '100.0' start_line: 785 end_line: 785 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -971,6 +1020,7 @@ license_detections: - score: '100.0' start_line: 789 end_line: 789 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -985,6 +1035,7 @@ license_detections: - score: '100.0' start_line: 794 end_line: 794 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -999,6 +1050,7 @@ license_detections: - score: '100.0' start_line: 799 end_line: 799 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1010,6 +1062,7 @@ license_detections: - score: '100.0' start_line: 803 end_line: 803 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1024,6 +1077,7 @@ license_detections: - score: '100.0' start_line: 808 end_line: 808 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1035,6 +1089,7 @@ license_detections: - score: '100.0' start_line: 809 end_line: 826 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -1067,6 +1122,7 @@ license_detections: - score: '100.0' start_line: 838 end_line: 855 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -1100,6 +1156,7 @@ license_detections: - score: '100.0' start_line: 866 end_line: 877 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -1123,6 +1180,7 @@ license_detections: - score: '100.0' start_line: 880 end_line: 880 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1134,6 +1192,7 @@ license_detections: - score: '100.0' start_line: 884 end_line: 884 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1145,6 +1204,7 @@ license_detections: - score: '100.0' start_line: 885 end_line: 907 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -1182,6 +1242,7 @@ license_detections: - score: '100.0' start_line: 927 end_line: 927 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1196,6 +1257,7 @@ license_detections: - score: '100.0' start_line: 940 end_line: 940 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1210,6 +1272,7 @@ license_detections: - score: '100.0' start_line: 945 end_line: 945 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1221,6 +1284,7 @@ license_detections: - score: '100.0' start_line: 949 end_line: 949 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1235,6 +1299,7 @@ license_detections: - score: '100.0' start_line: 954 end_line: 954 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1249,6 +1314,7 @@ license_detections: - score: '100.0' start_line: 964 end_line: 964 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1260,6 +1326,7 @@ license_detections: - score: '100.0' start_line: 968 end_line: 968 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -1271,6 +1338,7 @@ license_detections: - score: '100.0' start_line: 972 end_line: 972 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1285,6 +1353,7 @@ license_detections: - score: '100.0' start_line: 978 end_line: 978 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1299,6 +1368,7 @@ license_detections: - score: '100.0' start_line: 983 end_line: 983 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1313,6 +1383,7 @@ license_detections: - score: '100.0' start_line: 988 end_line: 988 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1327,6 +1398,7 @@ license_detections: - score: '100.0' start_line: 993 end_line: 993 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1341,6 +1413,7 @@ license_detections: - score: '100.0' start_line: 999 end_line: 999 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1355,6 +1428,7 @@ license_detections: - score: '100.0' start_line: 1006 end_line: 1006 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1369,6 +1443,7 @@ license_detections: - score: '100.0' start_line: 1011 end_line: 1011 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1380,6 +1455,7 @@ license_detections: - score: '100.0' start_line: 1015 end_line: 1015 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1391,6 +1467,7 @@ license_detections: - score: '100.0' start_line: 1019 end_line: 1019 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1405,6 +1482,7 @@ license_detections: - score: '100.0' start_line: 1024 end_line: 1024 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1416,6 +1494,7 @@ license_detections: - score: '100.0' start_line: 1028 end_line: 1028 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1427,6 +1506,7 @@ license_detections: - score: '100.0' start_line: 1032 end_line: 1032 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1438,6 +1518,7 @@ license_detections: - score: '100.0' start_line: 1036 end_line: 1036 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1449,6 +1530,7 @@ license_detections: - score: '100.0' start_line: 1040 end_line: 1040 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -1463,6 +1545,7 @@ license_detections: - score: '100.0' start_line: 1047 end_line: 1047 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1477,6 +1560,7 @@ license_detections: - score: '100.0' start_line: 1052 end_line: 1052 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1488,6 +1572,7 @@ license_detections: - score: '100.0' start_line: 1056 end_line: 1056 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1502,6 +1587,7 @@ license_detections: - score: '100.0' start_line: 1061 end_line: 1061 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1513,6 +1599,7 @@ license_detections: - score: '100.0' start_line: 1065 end_line: 1065 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1524,6 +1611,7 @@ license_detections: - score: '100.0' start_line: 1069 end_line: 1069 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1538,6 +1626,7 @@ license_detections: - score: '100.0' start_line: 1074 end_line: 1074 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho @@ -1549,6 +1638,7 @@ license_detections: - score: '100.0' start_line: 1077 end_line: 1097 + from_file: matched_length: 206 match_coverage: '100.0' matcher: 2-aho 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 ec19d4f7c9c..421a99bfb97 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 @@ -33,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 57 end_line: 63 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 1-hash @@ -54,6 +55,7 @@ other_license_detections: - score: '100.0' start_line: 65 end_line: 65 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -65,6 +67,7 @@ other_license_detections: - score: '100.0' start_line: 66 end_line: 81 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 1-hash @@ -95,6 +98,7 @@ other_license_detections: - score: '100.0' start_line: 83 end_line: 83 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -106,6 +110,7 @@ other_license_detections: - score: '100.0' start_line: 84 end_line: 98 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -135,6 +140,7 @@ other_license_detections: - score: '100.0' start_line: 101 end_line: 124 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 1-hash 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 c8a31e5b269..e1261dcb11f 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 @@ -28,6 +28,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 39 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +62,7 @@ license_detections: - score: '100.0' start_line: 41 end_line: 52 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -84,6 +86,7 @@ license_detections: - score: '100.0' start_line: 54 end_line: 56 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -101,6 +104,7 @@ license_detections: - score: '100.0' start_line: 64 end_line: 70 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -122,6 +126,7 @@ license_detections: - score: '100.0' start_line: 82 end_line: 111 + from_file: matched_length: 244 match_coverage: '100.0' matcher: 2-aho @@ -166,6 +171,7 @@ license_detections: - score: '98.73' start_line: 128 end_line: 146 + from_file: matched_length: 155 match_coverage: '100.0' matcher: 2-aho @@ -199,6 +205,7 @@ license_detections: - score: '100.0' start_line: 156 end_line: 175 + from_file: matched_length: 117 match_coverage: '100.0' matcher: 2-aho @@ -233,6 +240,7 @@ license_detections: - score: '100.0' start_line: 187 end_line: 214 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -275,6 +283,7 @@ license_detections: - score: '100.0' start_line: 222 end_line: 240 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -308,6 +317,7 @@ license_detections: - score: '100.0' start_line: 248 end_line: 272 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -347,6 +357,7 @@ license_detections: - score: '100.0' start_line: 334 end_line: 352 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -380,6 +391,7 @@ license_detections: - score: '100.0' start_line: 363 end_line: 390 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -422,6 +434,7 @@ license_detections: - score: '100.0' start_line: 400 end_line: 427 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho @@ -464,6 +477,7 @@ license_detections: - score: '100.0' start_line: 440 end_line: 459 + from_file: matched_length: 186 match_coverage: '100.0' matcher: 2-aho @@ -498,6 +512,7 @@ license_detections: - score: '100.0' start_line: 469 end_line: 476 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +535,7 @@ license_detections: - score: '100.0' start_line: 485 end_line: 503 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 2-aho @@ -553,6 +569,7 @@ license_detections: - score: '100.0' start_line: 511 end_line: 558 + from_file: matched_length: 330 match_coverage: '100.0' matcher: 2-aho @@ -615,6 +632,7 @@ license_detections: - score: '100.0' start_line: 568 end_line: 595 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -657,6 +675,7 @@ license_detections: - score: '100.0' start_line: 608 end_line: 636 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -700,6 +719,7 @@ license_detections: - score: '100.0' start_line: 647 end_line: 675 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -743,6 +763,7 @@ license_detections: - score: '100.0' start_line: 682 end_line: 705 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -781,6 +802,7 @@ license_detections: - score: '99.0' start_line: 713 end_line: 729 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -812,6 +834,7 @@ license_detections: - score: '95.0' start_line: 735 end_line: 743 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 2-aho @@ -835,6 +858,7 @@ license_detections: - score: '100.0' start_line: 752 end_line: 763 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho @@ -861,6 +885,7 @@ license_detections: - score: '100.0' start_line: 769 end_line: 776 + from_file: matched_length: 69 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +908,7 @@ license_detections: - score: '100.0' start_line: 782 end_line: 800 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -916,6 +942,7 @@ license_detections: - score: '100.0' start_line: 810 end_line: 833 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -951,6 +978,7 @@ license_detections: - score: '100.0' start_line: 837 end_line: 856 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -985,6 +1013,7 @@ license_detections: - score: '100.0' start_line: 866 end_line: 899 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1033,6 +1062,7 @@ license_detections: - score: '99.0' start_line: 907 end_line: 922 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 2-aho @@ -1063,6 +1093,7 @@ license_detections: - score: '100.0' start_line: 934 end_line: 968 + from_file: matched_length: 245 match_coverage: '100.0' matcher: 2-aho @@ -1112,6 +1143,7 @@ license_detections: - score: '100.0' start_line: 978 end_line: 996 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -1145,6 +1177,7 @@ license_detections: - score: '100.0' start_line: 1004 end_line: 1016 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho @@ -1172,6 +1205,7 @@ license_detections: - score: '95.0' start_line: 1025 end_line: 1037 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho @@ -1199,6 +1233,7 @@ license_detections: - score: '100.0' start_line: 1046 end_line: 1047 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -1215,6 +1250,7 @@ license_detections: - score: '100.0' start_line: 1060 end_line: 1087 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 2-aho @@ -1257,6 +1293,7 @@ license_detections: - score: '100.0' start_line: 1096 end_line: 1112 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1288,6 +1325,7 @@ license_detections: - score: '100.0' start_line: 1121 end_line: 1137 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1319,6 +1357,7 @@ license_detections: - score: '100.0' start_line: 1147 end_line: 1153 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 2-aho @@ -1340,6 +1379,7 @@ license_detections: - score: '100.0' start_line: 1163 end_line: 1181 + from_file: matched_length: 177 match_coverage: '100.0' matcher: 2-aho @@ -1373,6 +1413,7 @@ license_detections: - score: '100.0' start_line: 1190 end_line: 1217 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1415,6 +1456,7 @@ license_detections: - score: '100.0' start_line: 1226 end_line: 1264 + from_file: matched_length: 335 match_coverage: '100.0' matcher: 2-aho @@ -1468,6 +1510,7 @@ license_detections: - score: '100.0' start_line: 1274 end_line: 1302 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -1511,6 +1554,7 @@ license_detections: - score: '100.0' start_line: 1311 end_line: 1334 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho 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 fc8302cb0c4..f33b7b4432a 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 @@ -198,6 +198,7 @@ other_license_detections: - score: '100.0' start_line: 276 end_line: 276 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -209,6 +210,7 @@ other_license_detections: - score: '100.0' start_line: 277 end_line: 293 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 1-hash @@ -240,6 +242,7 @@ other_license_detections: - score: '100.0' start_line: 489 end_line: 489 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -251,6 +254,7 @@ other_license_detections: - score: '100.0' start_line: 490 end_line: 505 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -281,6 +285,7 @@ other_license_detections: - score: '100.0' start_line: 525 end_line: 528 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -299,6 +304,7 @@ other_license_detections: - score: '100.0' start_line: 533 end_line: 534 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +321,7 @@ other_license_detections: - score: '100.0' start_line: 539 end_line: 539 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +333,7 @@ other_license_detections: - score: '100.0' start_line: 540 end_line: 556 + from_file: matched_length: 131 match_coverage: '100.0' matcher: 1-hash @@ -357,6 +365,7 @@ other_license_detections: - score: '100.0' start_line: 565 end_line: 567 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -374,6 +383,7 @@ other_license_detections: - score: '100.0' start_line: 569 end_line: 569 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +395,7 @@ other_license_detections: - score: '100.0' start_line: 570 end_line: 585 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -415,6 +426,7 @@ other_license_detections: - score: '100.0' start_line: 587 end_line: 587 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +438,7 @@ other_license_detections: - score: '100.0' start_line: 588 end_line: 605 + from_file: matched_length: 140 match_coverage: '100.0' matcher: 1-hash @@ -458,6 +471,7 @@ other_license_detections: - score: '100.0' start_line: 608 end_line: 625 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -491,6 +505,7 @@ other_license_detections: - score: '100.0' start_line: 10 end_line: 16 + from_file: matched_length: 79 match_coverage: '100.0' matcher: 2-aho @@ -509,6 +524,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 47 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +536,7 @@ other_license_detections: - score: '100.0' start_line: 55 end_line: 55 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -531,6 +548,7 @@ other_license_detections: - score: '100.0' start_line: 60 end_line: 60 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -542,6 +560,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 65 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -555,6 +574,7 @@ other_license_detections: - score: '100.0' start_line: 69 end_line: 69 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -566,6 +586,7 @@ other_license_detections: - score: '100.0' start_line: 74 end_line: 74 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -577,6 +598,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 82 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -590,6 +612,7 @@ other_license_detections: - score: '100.0' start_line: 87 end_line: 87 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -601,6 +624,7 @@ other_license_detections: - score: '100.0' start_line: 92 end_line: 93 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -614,6 +638,7 @@ other_license_detections: - score: '100.0' start_line: 105 end_line: 105 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -625,6 +650,7 @@ other_license_detections: - score: '100.0' start_line: 106 end_line: 106 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho 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 b0cfa8f09da..397069b2e35 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 @@ -24,6 +24,7 @@ other_license_detections: - score: '100.0' start_line: 28 end_line: 28 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -35,6 +36,7 @@ other_license_detections: - score: '100.0' start_line: 29 end_line: 43 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 1-hash @@ -64,6 +66,7 @@ other_license_detections: - score: '100.0' start_line: 45 end_line: 45 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +78,7 @@ other_license_detections: - score: '100.0' start_line: 46 end_line: 60 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 1-hash @@ -104,6 +108,7 @@ other_license_detections: - score: '100.0' start_line: 62 end_line: 62 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -115,6 +120,7 @@ other_license_detections: - score: '100.0' start_line: 63 end_line: 77 + from_file: matched_length: 131 match_coverage: '100.0' matcher: 1-hash @@ -144,6 +150,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 80 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -155,6 +162,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 113 + from_file: matched_length: 309 match_coverage: '100.0' matcher: 2-aho 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 c8a31e5b269..e1261dcb11f 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 @@ -28,6 +28,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 39 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +62,7 @@ license_detections: - score: '100.0' start_line: 41 end_line: 52 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -84,6 +86,7 @@ license_detections: - score: '100.0' start_line: 54 end_line: 56 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -101,6 +104,7 @@ license_detections: - score: '100.0' start_line: 64 end_line: 70 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -122,6 +126,7 @@ license_detections: - score: '100.0' start_line: 82 end_line: 111 + from_file: matched_length: 244 match_coverage: '100.0' matcher: 2-aho @@ -166,6 +171,7 @@ license_detections: - score: '98.73' start_line: 128 end_line: 146 + from_file: matched_length: 155 match_coverage: '100.0' matcher: 2-aho @@ -199,6 +205,7 @@ license_detections: - score: '100.0' start_line: 156 end_line: 175 + from_file: matched_length: 117 match_coverage: '100.0' matcher: 2-aho @@ -233,6 +240,7 @@ license_detections: - score: '100.0' start_line: 187 end_line: 214 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -275,6 +283,7 @@ license_detections: - score: '100.0' start_line: 222 end_line: 240 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -308,6 +317,7 @@ license_detections: - score: '100.0' start_line: 248 end_line: 272 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -347,6 +357,7 @@ license_detections: - score: '100.0' start_line: 334 end_line: 352 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -380,6 +391,7 @@ license_detections: - score: '100.0' start_line: 363 end_line: 390 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -422,6 +434,7 @@ license_detections: - score: '100.0' start_line: 400 end_line: 427 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho @@ -464,6 +477,7 @@ license_detections: - score: '100.0' start_line: 440 end_line: 459 + from_file: matched_length: 186 match_coverage: '100.0' matcher: 2-aho @@ -498,6 +512,7 @@ license_detections: - score: '100.0' start_line: 469 end_line: 476 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +535,7 @@ license_detections: - score: '100.0' start_line: 485 end_line: 503 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 2-aho @@ -553,6 +569,7 @@ license_detections: - score: '100.0' start_line: 511 end_line: 558 + from_file: matched_length: 330 match_coverage: '100.0' matcher: 2-aho @@ -615,6 +632,7 @@ license_detections: - score: '100.0' start_line: 568 end_line: 595 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -657,6 +675,7 @@ license_detections: - score: '100.0' start_line: 608 end_line: 636 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -700,6 +719,7 @@ license_detections: - score: '100.0' start_line: 647 end_line: 675 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -743,6 +763,7 @@ license_detections: - score: '100.0' start_line: 682 end_line: 705 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -781,6 +802,7 @@ license_detections: - score: '99.0' start_line: 713 end_line: 729 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -812,6 +834,7 @@ license_detections: - score: '95.0' start_line: 735 end_line: 743 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 2-aho @@ -835,6 +858,7 @@ license_detections: - score: '100.0' start_line: 752 end_line: 763 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho @@ -861,6 +885,7 @@ license_detections: - score: '100.0' start_line: 769 end_line: 776 + from_file: matched_length: 69 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +908,7 @@ license_detections: - score: '100.0' start_line: 782 end_line: 800 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -916,6 +942,7 @@ license_detections: - score: '100.0' start_line: 810 end_line: 833 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -951,6 +978,7 @@ license_detections: - score: '100.0' start_line: 837 end_line: 856 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -985,6 +1013,7 @@ license_detections: - score: '100.0' start_line: 866 end_line: 899 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1033,6 +1062,7 @@ license_detections: - score: '99.0' start_line: 907 end_line: 922 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 2-aho @@ -1063,6 +1093,7 @@ license_detections: - score: '100.0' start_line: 934 end_line: 968 + from_file: matched_length: 245 match_coverage: '100.0' matcher: 2-aho @@ -1112,6 +1143,7 @@ license_detections: - score: '100.0' start_line: 978 end_line: 996 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -1145,6 +1177,7 @@ license_detections: - score: '100.0' start_line: 1004 end_line: 1016 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho @@ -1172,6 +1205,7 @@ license_detections: - score: '95.0' start_line: 1025 end_line: 1037 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho @@ -1199,6 +1233,7 @@ license_detections: - score: '100.0' start_line: 1046 end_line: 1047 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -1215,6 +1250,7 @@ license_detections: - score: '100.0' start_line: 1060 end_line: 1087 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 2-aho @@ -1257,6 +1293,7 @@ license_detections: - score: '100.0' start_line: 1096 end_line: 1112 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1288,6 +1325,7 @@ license_detections: - score: '100.0' start_line: 1121 end_line: 1137 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1319,6 +1357,7 @@ license_detections: - score: '100.0' start_line: 1147 end_line: 1153 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 2-aho @@ -1340,6 +1379,7 @@ license_detections: - score: '100.0' start_line: 1163 end_line: 1181 + from_file: matched_length: 177 match_coverage: '100.0' matcher: 2-aho @@ -1373,6 +1413,7 @@ license_detections: - score: '100.0' start_line: 1190 end_line: 1217 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1415,6 +1456,7 @@ license_detections: - score: '100.0' start_line: 1226 end_line: 1264 + from_file: matched_length: 335 match_coverage: '100.0' matcher: 2-aho @@ -1468,6 +1510,7 @@ license_detections: - score: '100.0' start_line: 1274 end_line: 1302 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -1511,6 +1554,7 @@ license_detections: - score: '100.0' start_line: 1311 end_line: 1334 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho 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 fbc6071bc86..8d1d7682893 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 @@ -17,6 +17,7 @@ other_license_detections: - score: '100.0' start_line: 20 end_line: 20 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -28,6 +29,7 @@ other_license_detections: - score: '100.0' start_line: 21 end_line: 35 + from_file: matched_length: 122 match_coverage: '100.0' matcher: 1-hash @@ -57,6 +59,7 @@ other_license_detections: - score: '100.0' start_line: 37 end_line: 37 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -68,6 +71,7 @@ other_license_detections: - score: '100.0' start_line: 38 end_line: 52 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash 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 c8a31e5b269..e1261dcb11f 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 @@ -28,6 +28,7 @@ license_detections: - score: '100.0' start_line: 18 end_line: 39 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +62,7 @@ license_detections: - score: '100.0' start_line: 41 end_line: 52 + from_file: matched_length: 104 match_coverage: '100.0' matcher: 2-aho @@ -84,6 +86,7 @@ license_detections: - score: '100.0' start_line: 54 end_line: 56 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 2-aho @@ -101,6 +104,7 @@ license_detections: - score: '100.0' start_line: 64 end_line: 70 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -122,6 +126,7 @@ license_detections: - score: '100.0' start_line: 82 end_line: 111 + from_file: matched_length: 244 match_coverage: '100.0' matcher: 2-aho @@ -166,6 +171,7 @@ license_detections: - score: '98.73' start_line: 128 end_line: 146 + from_file: matched_length: 155 match_coverage: '100.0' matcher: 2-aho @@ -199,6 +205,7 @@ license_detections: - score: '100.0' start_line: 156 end_line: 175 + from_file: matched_length: 117 match_coverage: '100.0' matcher: 2-aho @@ -233,6 +240,7 @@ license_detections: - score: '100.0' start_line: 187 end_line: 214 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -275,6 +283,7 @@ license_detections: - score: '100.0' start_line: 222 end_line: 240 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -308,6 +317,7 @@ license_detections: - score: '100.0' start_line: 248 end_line: 272 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -347,6 +357,7 @@ license_detections: - score: '100.0' start_line: 334 end_line: 352 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -380,6 +391,7 @@ license_detections: - score: '100.0' start_line: 363 end_line: 390 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -422,6 +434,7 @@ license_detections: - score: '100.0' start_line: 400 end_line: 427 + from_file: matched_length: 205 match_coverage: '100.0' matcher: 2-aho @@ -464,6 +477,7 @@ license_detections: - score: '100.0' start_line: 440 end_line: 459 + from_file: matched_length: 186 match_coverage: '100.0' matcher: 2-aho @@ -498,6 +512,7 @@ license_detections: - score: '100.0' start_line: 469 end_line: 476 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +535,7 @@ license_detections: - score: '100.0' start_line: 485 end_line: 503 + from_file: matched_length: 159 match_coverage: '100.0' matcher: 2-aho @@ -553,6 +569,7 @@ license_detections: - score: '100.0' start_line: 511 end_line: 558 + from_file: matched_length: 330 match_coverage: '100.0' matcher: 2-aho @@ -615,6 +632,7 @@ license_detections: - score: '100.0' start_line: 568 end_line: 595 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -657,6 +675,7 @@ license_detections: - score: '100.0' start_line: 608 end_line: 636 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -700,6 +719,7 @@ license_detections: - score: '100.0' start_line: 647 end_line: 675 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -743,6 +763,7 @@ license_detections: - score: '100.0' start_line: 682 end_line: 705 + from_file: matched_length: 185 match_coverage: '100.0' matcher: 2-aho @@ -781,6 +802,7 @@ license_detections: - score: '99.0' start_line: 713 end_line: 729 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 2-aho @@ -812,6 +834,7 @@ license_detections: - score: '95.0' start_line: 735 end_line: 743 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 2-aho @@ -835,6 +858,7 @@ license_detections: - score: '100.0' start_line: 752 end_line: 763 + from_file: matched_length: 99 match_coverage: '100.0' matcher: 2-aho @@ -861,6 +885,7 @@ license_detections: - score: '100.0' start_line: 769 end_line: 776 + from_file: matched_length: 69 match_coverage: '100.0' matcher: 2-aho @@ -883,6 +908,7 @@ license_detections: - score: '100.0' start_line: 782 end_line: 800 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 2-aho @@ -916,6 +942,7 @@ license_detections: - score: '100.0' start_line: 810 end_line: 833 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho @@ -951,6 +978,7 @@ license_detections: - score: '100.0' start_line: 837 end_line: 856 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -985,6 +1013,7 @@ license_detections: - score: '100.0' start_line: 866 end_line: 899 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 2-aho @@ -1033,6 +1062,7 @@ license_detections: - score: '99.0' start_line: 907 end_line: 922 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 2-aho @@ -1063,6 +1093,7 @@ license_detections: - score: '100.0' start_line: 934 end_line: 968 + from_file: matched_length: 245 match_coverage: '100.0' matcher: 2-aho @@ -1112,6 +1143,7 @@ license_detections: - score: '100.0' start_line: 978 end_line: 996 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 2-aho @@ -1145,6 +1177,7 @@ license_detections: - score: '100.0' start_line: 1004 end_line: 1016 + from_file: matched_length: 111 match_coverage: '100.0' matcher: 2-aho @@ -1172,6 +1205,7 @@ license_detections: - score: '95.0' start_line: 1025 end_line: 1037 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 2-aho @@ -1199,6 +1233,7 @@ license_detections: - score: '100.0' start_line: 1046 end_line: 1047 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -1215,6 +1250,7 @@ license_detections: - score: '100.0' start_line: 1060 end_line: 1087 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 2-aho @@ -1257,6 +1293,7 @@ license_detections: - score: '100.0' start_line: 1096 end_line: 1112 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1288,6 +1325,7 @@ license_detections: - score: '100.0' start_line: 1121 end_line: 1137 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 2-aho @@ -1319,6 +1357,7 @@ license_detections: - score: '100.0' start_line: 1147 end_line: 1153 + from_file: matched_length: 54 match_coverage: '100.0' matcher: 2-aho @@ -1340,6 +1379,7 @@ license_detections: - score: '100.0' start_line: 1163 end_line: 1181 + from_file: matched_length: 177 match_coverage: '100.0' matcher: 2-aho @@ -1373,6 +1413,7 @@ license_detections: - score: '100.0' start_line: 1190 end_line: 1217 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -1415,6 +1456,7 @@ license_detections: - score: '100.0' start_line: 1226 end_line: 1264 + from_file: matched_length: 335 match_coverage: '100.0' matcher: 2-aho @@ -1468,6 +1510,7 @@ license_detections: - score: '100.0' start_line: 1274 end_line: 1302 + from_file: matched_length: 212 match_coverage: '100.0' matcher: 2-aho @@ -1511,6 +1554,7 @@ license_detections: - score: '100.0' start_line: 1311 end_line: 1334 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 2-aho 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 4a9592b99e7..888f0ef7b3a 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 @@ -33,6 +33,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 64 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -44,6 +45,7 @@ other_license_detections: - score: '100.0' start_line: 65 end_line: 70 + from_file: matched_length: 59 match_coverage: '100.0' matcher: 1-hash @@ -64,6 +66,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 72 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +78,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 79 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 1-hash @@ -96,6 +100,7 @@ other_license_detections: - score: '100.0' start_line: 82 end_line: 101 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash 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 f13e97f8a68..b67d914a030 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 @@ -66,6 +66,7 @@ other_license_detections: - score: '100.0' start_line: 23 end_line: 23 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -77,6 +78,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 26 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -90,6 +92,7 @@ other_license_detections: - score: '100.0' start_line: 27 end_line: 28 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -103,6 +106,7 @@ other_license_detections: - score: '100.0' start_line: 31 end_line: 32 + from_file: matched_length: 9 match_coverage: '100.0' matcher: 2-aho @@ -116,6 +120,7 @@ other_license_detections: - score: '100.0' start_line: 35 end_line: 36 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -129,6 +134,7 @@ other_license_detections: - score: '100.0' start_line: 38 end_line: 38 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -140,6 +146,7 @@ other_license_detections: - score: '100.0' start_line: 40 end_line: 41 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -153,6 +160,7 @@ other_license_detections: - score: '100.0' start_line: 45 end_line: 45 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -164,6 +172,7 @@ other_license_detections: - score: '70.0' start_line: 47 end_line: 47 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -175,6 +184,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 48 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -188,6 +198,7 @@ other_license_detections: - score: '100.0' start_line: 50 end_line: 64 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 2-aho @@ -214,6 +225,7 @@ other_license_detections: - score: '100.0' start_line: 66 end_line: 69 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 2-aho @@ -229,6 +241,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 73 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -240,6 +253,7 @@ other_license_detections: - score: '100.0' start_line: 12 end_line: 12 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -254,6 +268,7 @@ other_license_detections: - score: '100.0' start_line: 90 end_line: 91 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -270,6 +285,7 @@ other_license_detections: - score: '55.0' start_line: 120 end_line: 120 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -284,6 +300,7 @@ other_license_detections: - score: '100.0' start_line: 136 end_line: 137 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -300,6 +317,7 @@ other_license_detections: - score: '100.0' start_line: 142 end_line: 142 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 1-hash @@ -314,6 +332,7 @@ other_license_detections: - score: '100.0' start_line: 180 end_line: 180 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -328,6 +347,7 @@ other_license_detections: - score: '100.0' start_line: 185 end_line: 185 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -342,6 +362,7 @@ other_license_detections: - score: '100.0' start_line: '191' end_line: '192' + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -358,6 +379,7 @@ other_license_detections: - score: '100.0' start_line: 209 end_line: 209 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 1-hash @@ -372,6 +394,7 @@ other_license_detections: - score: '100.0' start_line: 217 end_line: 217 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 1-hash @@ -386,6 +409,7 @@ other_license_detections: - score: '100.0' start_line: 238 end_line: 239 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -399,6 +423,7 @@ other_license_detections: - score: '100.0' start_line: 244 end_line: 246 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 2-aho @@ -413,6 +438,7 @@ other_license_detections: - score: '100.0' start_line: 257 end_line: 263 + from_file: matched_length: 72 match_coverage: '100.0' matcher: 2-aho @@ -431,6 +457,7 @@ other_license_detections: - score: '100.0' start_line: 265 end_line: 266 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 2-aho @@ -447,6 +474,7 @@ other_license_detections: - score: '100.0' start_line: 274 end_line: 274 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -458,6 +486,7 @@ other_license_detections: - score: '97.06' start_line: 275 end_line: 281 + from_file: matched_length: 66 match_coverage: '100.0' matcher: 3-seq @@ -479,6 +508,7 @@ other_license_detections: - score: '90.0' start_line: 289 end_line: 290 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -495,6 +525,7 @@ other_license_detections: - score: '100.0' start_line: 295 end_line: 296 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -511,6 +542,7 @@ other_license_detections: - score: '100.0' start_line: 298 end_line: 298 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -522,6 +554,7 @@ other_license_detections: - score: '100.0' start_line: 299 end_line: 314 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -552,6 +585,7 @@ other_license_detections: - score: '100.0' start_line: 316 end_line: 316 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -563,6 +597,7 @@ other_license_detections: - score: '100.0' start_line: 317 end_line: 329 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 1-hash @@ -590,6 +625,7 @@ other_license_detections: - score: '100.0' start_line: 331 end_line: 331 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -601,6 +637,7 @@ other_license_detections: - score: '100.0' start_line: 332 end_line: 347 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -631,6 +668,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 377 + from_file: matched_length: 252 match_coverage: '100.0' matcher: 1-hash @@ -673,6 +711,7 @@ other_license_detections: - score: '100.0' start_line: 380 end_line: 382 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -690,6 +729,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 388 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -708,6 +748,7 @@ other_license_detections: - score: '100.0' start_line: 12 end_line: 12 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -722,6 +763,7 @@ other_license_detections: - score: '100.0' start_line: 104 end_line: 104 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -733,6 +775,7 @@ other_license_detections: - score: '100.0' start_line: 108 end_line: 109 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 fc8302cb0c4..f33b7b4432a 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 @@ -198,6 +198,7 @@ other_license_detections: - score: '100.0' start_line: 276 end_line: 276 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -209,6 +210,7 @@ other_license_detections: - score: '100.0' start_line: 277 end_line: 293 + from_file: matched_length: 143 match_coverage: '100.0' matcher: 1-hash @@ -240,6 +242,7 @@ other_license_detections: - score: '100.0' start_line: 489 end_line: 489 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -251,6 +254,7 @@ other_license_detections: - score: '100.0' start_line: 490 end_line: 505 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -281,6 +285,7 @@ other_license_detections: - score: '100.0' start_line: 525 end_line: 528 + from_file: matched_length: 42 match_coverage: '100.0' matcher: 1-hash @@ -299,6 +304,7 @@ other_license_detections: - score: '100.0' start_line: 533 end_line: 534 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +321,7 @@ other_license_detections: - score: '100.0' start_line: 539 end_line: 539 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +333,7 @@ other_license_detections: - score: '100.0' start_line: 540 end_line: 556 + from_file: matched_length: 131 match_coverage: '100.0' matcher: 1-hash @@ -357,6 +365,7 @@ other_license_detections: - score: '100.0' start_line: 565 end_line: 567 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -374,6 +383,7 @@ other_license_detections: - score: '100.0' start_line: 569 end_line: 569 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +395,7 @@ other_license_detections: - score: '100.0' start_line: 570 end_line: 585 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -415,6 +426,7 @@ other_license_detections: - score: '100.0' start_line: 587 end_line: 587 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +438,7 @@ other_license_detections: - score: '100.0' start_line: 588 end_line: 605 + from_file: matched_length: 140 match_coverage: '100.0' matcher: 1-hash @@ -458,6 +471,7 @@ other_license_detections: - score: '100.0' start_line: 608 end_line: 625 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -491,6 +505,7 @@ other_license_detections: - score: '100.0' start_line: 10 end_line: 16 + from_file: matched_length: 79 match_coverage: '100.0' matcher: 2-aho @@ -509,6 +524,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 47 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -520,6 +536,7 @@ other_license_detections: - score: '100.0' start_line: 55 end_line: 55 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -531,6 +548,7 @@ other_license_detections: - score: '100.0' start_line: 60 end_line: 60 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -542,6 +560,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 65 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -555,6 +574,7 @@ other_license_detections: - score: '100.0' start_line: 69 end_line: 69 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -566,6 +586,7 @@ other_license_detections: - score: '100.0' start_line: 74 end_line: 74 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -577,6 +598,7 @@ other_license_detections: - score: '100.0' start_line: 81 end_line: 82 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -590,6 +612,7 @@ other_license_detections: - score: '100.0' start_line: 87 end_line: 87 + from_file: matched_length: 6 match_coverage: '100.0' matcher: 2-aho @@ -601,6 +624,7 @@ other_license_detections: - score: '100.0' start_line: 92 end_line: 93 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -614,6 +638,7 @@ other_license_detections: - score: '100.0' start_line: 105 end_line: 105 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -625,6 +650,7 @@ other_license_detections: - score: '100.0' start_line: 106 end_line: 106 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 2-aho 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 b6536c78f6d..53609ade9ee 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 @@ -43,6 +43,7 @@ license_detections: - score: '100.0' start_line: 171 end_line: '196' + from_file: matched_length: 214 match_coverage: '100.0' matcher: 1-hash @@ -83,6 +84,7 @@ license_detections: - score: '100.0' start_line: '199' end_line: 218 + from_file: matched_length: 165 match_coverage: '100.0' matcher: 1-hash @@ -117,6 +119,7 @@ license_detections: - score: '100.0' start_line: 221 end_line: 240 + from_file: matched_length: 171 match_coverage: '100.0' matcher: 1-hash @@ -151,6 +154,7 @@ license_detections: - score: '100.0' start_line: 243 end_line: 264 + from_file: matched_length: 186 match_coverage: '100.0' matcher: 1-hash @@ -187,6 +191,7 @@ license_detections: - score: '100.0' start_line: 266 end_line: 266 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -198,6 +203,7 @@ license_detections: - score: '100.0' start_line: 267 end_line: 280 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 1-hash @@ -226,6 +232,7 @@ license_detections: - score: '100.0' start_line: 282 end_line: 282 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -237,6 +244,7 @@ license_detections: - score: '100.0' start_line: 283 end_line: 298 + from_file: matched_length: 139 match_coverage: '100.0' matcher: 1-hash @@ -267,6 +275,7 @@ license_detections: - score: '100.0' start_line: 301 end_line: 321 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 1-hash @@ -302,6 +311,7 @@ license_detections: - score: '100.0' start_line: 324 end_line: 326 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -319,6 +329,7 @@ license_detections: - score: '100.0' start_line: 329 end_line: 336 + from_file: matched_length: 63 match_coverage: '100.0' matcher: 1-hash @@ -341,6 +352,7 @@ license_detections: - score: '100.0' start_line: 339 end_line: 340 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -357,6 +369,7 @@ license_detections: - score: '100.0' start_line: 343 end_line: 346 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 1-hash @@ -375,6 +388,7 @@ license_detections: - score: '100.0' start_line: 349 end_line: 356 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 1-hash 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 ee8f1789fc0..ef3803a85a2 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 @@ -28,6 +28,7 @@ other_license_detections: - score: '100.0' start_line: 17 end_line: 24 + from_file: matched_length: 64 match_coverage: '100.0' matcher: 1-hash @@ -50,6 +51,7 @@ other_license_detections: - score: '100.0' start_line: 61 end_line: 71 + from_file: matched_length: 110 match_coverage: '100.0' matcher: 1-hash @@ -75,6 +77,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 91 + from_file: matched_length: 113 match_coverage: '100.0' matcher: 2-aho @@ -98,6 +101,7 @@ other_license_detections: - score: '100.0' start_line: 96 end_line: 115 + from_file: matched_length: 203 match_coverage: '100.0' matcher: 2-aho @@ -132,6 +136,7 @@ other_license_detections: - score: '100.0' start_line: 160 end_line: 160 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -146,6 +151,7 @@ other_license_detections: - score: '100.0' start_line: 165 end_line: 187 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -183,6 +189,7 @@ other_license_detections: - score: '80.0' start_line: 46 end_line: 55 + from_file: matched_length: 86 match_coverage: '100.0' matcher: 2-aho @@ -207,6 +214,7 @@ other_license_detections: - score: '100.0' start_line: 151 end_line: 152 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 1-hash 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 654f319ea93..e8168274afc 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 @@ -9,6 +9,7 @@ license_detections: - score: '98.6' start_line: 25 end_line: 63 + from_file: matched_length: 282 match_coverage: '100.0' matcher: 3-seq @@ -59,6 +60,7 @@ license_detections: - score: '100.0' start_line: 66 end_line: 67 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho 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 da84a728c59..a08fb988052 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 3 end_line: 5 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 2-aho @@ -27,6 +28,7 @@ license_detections: - score: '100.0' start_line: 11 end_line: 11 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -38,6 +40,7 @@ license_detections: - score: '100.0' start_line: 14 end_line: 14 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -52,6 +55,7 @@ license_detections: - score: '99.0' start_line: 58 end_line: 58 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -63,6 +67,7 @@ license_detections: - score: '100.0' start_line: 61 end_line: 85 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 2-aho 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 fd2832af098..578b879f852 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 7 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -23,6 +24,7 @@ license_detections: - score: '100.0' start_line: 13 end_line: 15 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho @@ -40,6 +42,7 @@ license_detections: - score: '100.0' start_line: 44 end_line: 72 + from_file: matched_length: 223 match_coverage: '100.0' matcher: 2-aho 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 2420d347245..1d0b1c2d5b5 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 @@ -17,6 +17,7 @@ other_license_detections: - score: '100.0' start_line: 25 end_line: 25 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -28,6 +29,7 @@ other_license_detections: - score: '100.0' start_line: 26 end_line: 39 + from_file: matched_length: 120 match_coverage: '100.0' matcher: 1-hash 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 6139a5bc493..ac4a37cbc17 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 @@ -10,6 +10,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 27 + from_file: matched_length: 153 match_coverage: '100.0' matcher: 2-aho @@ -45,6 +46,7 @@ license_detections: - score: '100.0' start_line: 32 end_line: 33 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +63,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 50 + from_file: matched_length: 97 match_coverage: '100.0' matcher: 2-aho @@ -88,6 +91,7 @@ license_detections: - score: '100.0' start_line: 56 end_line: 65 + from_file: matched_length: 78 match_coverage: '100.0' matcher: 2-aho 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 b6295a9584f..b0a2623f449 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 7 end_line: 22 + from_file: matched_length: 140 match_coverage: '100.0' matcher: 2-aho @@ -39,6 +40,7 @@ license_detections: - score: '100.0' start_line: 27 end_line: 36 + from_file: matched_length: 77 match_coverage: '100.0' matcher: 2-aho 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 e59beef3fad..828c77b386f 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 @@ -9,6 +9,7 @@ license_detections: - score: '89.63' start_line: 16 end_line: 41 + from_file: matched_length: 147 match_coverage: '89.63' matcher: 3-seq @@ -46,6 +47,7 @@ license_detections: - score: '100.0' start_line: 36 end_line: 46 + from_file: matched_length: 77 match_coverage: '100.0' matcher: 2-aho 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 71be22212c4..652a6d27422 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 15 end_line: 25 + from_file: matched_length: 112 match_coverage: '100.0' matcher: 2-aho 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 fb012d4a598..f02c66df17b 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 @@ -9,6 +9,7 @@ license_detections: - score: '99.89' start_line: 10 end_line: 133 + from_file: matched_length: 869 match_coverage: '99.89' matcher: 3-seq 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 175fe0c59c5..f3134d8276a 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 @@ -31,6 +31,7 @@ other_license_detections: - score: '100.0' start_line: 77 end_line: 78 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -47,6 +48,7 @@ other_license_detections: - score: '100.0' start_line: 150 end_line: 166 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -78,6 +80,7 @@ other_license_detections: - score: '100.0' start_line: 168 end_line: 168 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -89,6 +92,7 @@ other_license_detections: - score: '100.0' start_line: 169 end_line: 184 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -119,6 +123,7 @@ other_license_detections: - score: '100.0' start_line: 187 end_line: 215 + from_file: matched_length: 242 match_coverage: '100.0' matcher: 1-hash @@ -162,6 +167,7 @@ other_license_detections: - score: '100.0' start_line: 217 end_line: 217 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +179,7 @@ other_license_detections: - score: '100.0' start_line: 218 end_line: 233 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -203,6 +210,7 @@ other_license_detections: - score: '100.0' start_line: 235 end_line: 235 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -214,6 +222,7 @@ other_license_detections: - score: '100.0' start_line: 236 end_line: 251 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -244,6 +253,7 @@ other_license_detections: - score: '100.0' start_line: 253 end_line: 253 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -255,6 +265,7 @@ other_license_detections: - score: '100.0' start_line: 254 end_line: 262 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash 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 e9d680c697a..d12600b57f7 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 @@ -11,6 +11,7 @@ license_detections: - score: '95.45' start_line: 14 end_line: 15 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 2-aho @@ -27,6 +28,7 @@ license_detections: - score: '99.39' start_line: 23 end_line: 42 + from_file: matched_length: 164 match_coverage: '100.0' matcher: 2-aho @@ -61,6 +63,7 @@ license_detections: - score: '85.91' start_line: 50 end_line: 70 + from_file: matched_length: 128 match_coverage: '85.91' matcher: 3-seq @@ -93,6 +96,7 @@ license_detections: - score: '100.0' start_line: 69 end_line: 70 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 2-aho @@ -106,6 +110,7 @@ license_detections: - score: '100.0' start_line: 74 end_line: 83 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho 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 b881920bf75..efa5f73f314 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 @@ -16,6 +16,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 44 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 1-hash @@ -53,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 67 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +90,7 @@ other_license_detections: - score: '100.0' start_line: 70 end_line: 92 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash 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 8d9a21415aa..9b2865d645e 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 @@ -63,6 +63,7 @@ other_license_detections: - score: '20.0' start_line: 105 end_line: 105 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 1-hash @@ -77,6 +78,7 @@ other_license_detections: - score: '100.0' start_line: 164 end_line: 167 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 2-aho @@ -95,6 +97,7 @@ other_license_detections: - score: '100.0' start_line: 268 end_line: 289 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -131,6 +134,7 @@ other_license_detections: - score: '100.0' start_line: 292 end_line: 311 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash @@ -165,6 +169,7 @@ other_license_detections: - score: '100.0' start_line: 314 end_line: 339 + from_file: matched_length: 238 match_coverage: '100.0' matcher: 1-hash @@ -205,6 +210,7 @@ other_license_detections: - score: '100.0' start_line: 341 end_line: 341 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -216,6 +222,7 @@ other_license_detections: - score: '100.0' start_line: 342 end_line: 348 + from_file: matched_length: 75 match_coverage: '100.0' matcher: 1-hash @@ -237,6 +244,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -248,6 +256,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash 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 175fe0c59c5..f3134d8276a 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 @@ -31,6 +31,7 @@ other_license_detections: - score: '100.0' start_line: 77 end_line: 78 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -47,6 +48,7 @@ other_license_detections: - score: '100.0' start_line: 150 end_line: 166 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -78,6 +80,7 @@ other_license_detections: - score: '100.0' start_line: 168 end_line: 168 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -89,6 +92,7 @@ other_license_detections: - score: '100.0' start_line: 169 end_line: 184 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -119,6 +123,7 @@ other_license_detections: - score: '100.0' start_line: 187 end_line: 215 + from_file: matched_length: 242 match_coverage: '100.0' matcher: 1-hash @@ -162,6 +167,7 @@ other_license_detections: - score: '100.0' start_line: 217 end_line: 217 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +179,7 @@ other_license_detections: - score: '100.0' start_line: 218 end_line: 233 + from_file: matched_length: 134 match_coverage: '100.0' matcher: 1-hash @@ -203,6 +210,7 @@ other_license_detections: - score: '100.0' start_line: 235 end_line: 235 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -214,6 +222,7 @@ other_license_detections: - score: '100.0' start_line: 236 end_line: 251 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -244,6 +253,7 @@ other_license_detections: - score: '100.0' start_line: 253 end_line: 253 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -255,6 +265,7 @@ other_license_detections: - score: '100.0' start_line: 254 end_line: 262 + from_file: matched_length: 82 match_coverage: '100.0' matcher: 1-hash 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 ace3c9b831a..ba367830aa4 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 @@ -32,6 +32,7 @@ other_license_detections: - score: '100.0' start_line: 13 end_line: 15 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -49,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 21 end_line: 25 + from_file: matched_length: 50 match_coverage: '100.0' matcher: 1-hash @@ -68,6 +70,7 @@ other_license_detections: - score: '100.0' start_line: 54 end_line: 54 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -79,6 +82,7 @@ other_license_detections: - score: '100.0' start_line: 55 end_line: 70 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -109,6 +113,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 72 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -120,6 +125,7 @@ other_license_detections: - score: '100.0' start_line: 73 end_line: 88 + from_file: matched_length: 128 match_coverage: '100.0' matcher: 1-hash @@ -150,6 +156,7 @@ other_license_detections: - score: '100.0' start_line: 90 end_line: 90 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -161,6 +168,7 @@ other_license_detections: - score: '100.0' start_line: 91 end_line: 108 + from_file: matched_length: 136 match_coverage: '100.0' matcher: 1-hash @@ -193,6 +201,7 @@ other_license_detections: - score: '100.0' start_line: 110 end_line: 110 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -204,6 +213,7 @@ other_license_detections: - score: '100.0' start_line: 111 end_line: 120 + from_file: matched_length: 93 match_coverage: '100.0' matcher: 1-hash @@ -228,6 +238,7 @@ other_license_detections: - score: '100.0' start_line: 123 end_line: 143 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 1-hash 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 5c833718118..a1d7655061e 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 @@ -16,6 +16,7 @@ other_license_detections: - score: '100.0' start_line: 20 end_line: 39 + from_file: matched_length: 183 match_coverage: '100.0' matcher: 1-hash @@ -50,6 +51,7 @@ other_license_detections: - score: '100.0' start_line: 41 end_line: 41 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -61,6 +63,7 @@ other_license_detections: - score: '100.0' start_line: 42 end_line: 57 + from_file: matched_length: 129 match_coverage: '100.0' matcher: 1-hash 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 08889f85a9a..690de1100d4 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 @@ -22,6 +22,7 @@ other_license_detections: - score: '100.0' start_line: 30 end_line: 44 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -51,6 +52,7 @@ other_license_detections: - score: '100.0' start_line: 59 end_line: 77 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -84,6 +86,7 @@ other_license_detections: - score: '100.0' start_line: 79 end_line: 79 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -95,6 +98,7 @@ other_license_detections: - score: '100.0' start_line: 80 end_line: 94 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -124,6 +128,7 @@ other_license_detections: - score: '100.0' start_line: 97 end_line: 117 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 1-hash 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 7039cf55707..6721be0009d 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 @@ -9,6 +9,7 @@ license_detections: - score: '97.18' start_line: 20 end_line: 42 + from_file: matched_length: 207 match_coverage: '100.0' matcher: 3-seq @@ -46,6 +47,7 @@ license_detections: - score: '100.0' start_line: 72 end_line: 85 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -67,6 +69,7 @@ license_detections: - score: '100.0' start_line: 92 end_line: 103 + from_file: matched_length: 100 match_coverage: '100.0' matcher: 2-aho 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 6ca09097ea4..2783592c4b5 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 @@ -11,6 +11,7 @@ license_detections: - score: '99.02' start_line: 17 end_line: 30 + from_file: matched_length: 101 match_coverage: '99.02' matcher: 3-seq @@ -33,6 +34,7 @@ license_detections: - score: '100.0' start_line: 38 end_line: 45 + from_file: matched_length: 85 match_coverage: '100.0' matcher: 2-aho @@ -52,6 +54,7 @@ license_detections: - score: '100.0' start_line: 49 end_line: 73 + from_file: matched_length: 210 match_coverage: '100.0' matcher: 2-aho 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 aa839dd0ee3..feffc3b3288 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 @@ -15,6 +15,7 @@ other_license_detections: - score: '100.0' start_line: 15 end_line: 37 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -52,6 +53,7 @@ other_license_detections: - score: '100.0' start_line: 39 end_line: 39 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -63,6 +65,7 @@ other_license_detections: - score: '100.0' start_line: 40 end_line: 58 + from_file: matched_length: 131 match_coverage: '100.0' matcher: 1-hash 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 7b3682c77ae..a17dd9f064f 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 @@ -9,6 +9,7 @@ license_detections: - score: '99.18' start_line: '19' end_line: 32 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 2-aho 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 b881920bf75..efa5f73f314 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 @@ -16,6 +16,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 44 + from_file: matched_length: 200 match_coverage: '100.0' matcher: 1-hash @@ -53,6 +54,7 @@ other_license_detections: - score: '100.0' start_line: 47 end_line: 67 + from_file: matched_length: 201 match_coverage: '100.0' matcher: 1-hash @@ -88,6 +90,7 @@ other_license_detections: - score: '100.0' start_line: 70 end_line: 92 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash 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 7039cf55707..6721be0009d 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 @@ -9,6 +9,7 @@ license_detections: - score: '97.18' start_line: 20 end_line: 42 + from_file: matched_length: 207 match_coverage: '100.0' matcher: 3-seq @@ -46,6 +47,7 @@ license_detections: - score: '100.0' start_line: 72 end_line: 85 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 2-aho @@ -67,6 +69,7 @@ license_detections: - score: '100.0' start_line: 92 end_line: 103 + from_file: matched_length: 100 match_coverage: '100.0' matcher: 2-aho 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 03125163e9d..094d8babb87 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 @@ -705,6 +705,7 @@ other_license_detections: - score: '100.0' start_line: 2025 end_line: 2025 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -716,6 +717,7 @@ other_license_detections: - score: '100.0' start_line: 2026 end_line: 2027 + from_file: matched_length: 25 match_coverage: '100.0' matcher: 1-hash @@ -732,6 +734,7 @@ other_license_detections: - score: '100.0' start_line: 2029 end_line: 2029 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -743,6 +746,7 @@ other_license_detections: - score: '100.0' start_line: 2030 end_line: 2031 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -759,6 +763,7 @@ other_license_detections: - score: '100.0' start_line: 2033 end_line: 2033 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -770,6 +775,7 @@ other_license_detections: - score: '100.0' start_line: 2034 end_line: 2036 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 1-hash @@ -787,6 +793,7 @@ other_license_detections: - score: '99.0' start_line: 2038 end_line: 2038 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -798,6 +805,7 @@ other_license_detections: - score: '100.0' start_line: 2039 end_line: 2040 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -814,6 +822,7 @@ other_license_detections: - score: '100.0' start_line: 2043 end_line: 2224 + from_file: matched_length: 1354 match_coverage: '100.0' matcher: 1-hash @@ -1010,6 +1019,7 @@ other_license_detections: - score: '100.0' start_line: 2227 end_line: 2256 + from_file: matched_length: 233 match_coverage: '100.0' matcher: 2-aho @@ -1054,6 +1064,7 @@ other_license_detections: - score: '100.0' start_line: 2262 end_line: 2276 + from_file: matched_length: 132 match_coverage: '100.0' matcher: 1-hash @@ -1083,6 +1094,7 @@ other_license_detections: - score: '100.0' start_line: 2279 end_line: 2295 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash @@ -1114,6 +1126,7 @@ other_license_detections: - score: '100.0' start_line: 2298 end_line: 2320 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1151,6 +1164,7 @@ other_license_detections: - score: '98.25' start_line: 2323 end_line: 2349 + from_file: matched_length: 224 match_coverage: '100.0' matcher: 1-hash @@ -1192,6 +1206,7 @@ other_license_detections: - score: '99.57' start_line: 2353 end_line: 2407 + from_file: matched_length: 468 match_coverage: '99.57' matcher: 3-seq @@ -1261,6 +1276,7 @@ other_license_detections: - score: '100.0' start_line: 2410 end_line: 2432 + from_file: matched_length: 207 match_coverage: '100.0' matcher: 1-hash @@ -1298,6 +1314,7 @@ other_license_detections: - score: '100.0' start_line: 2435 end_line: 2457 + from_file: matched_length: 213 match_coverage: '100.0' matcher: 1-hash @@ -1335,6 +1352,7 @@ other_license_detections: - score: '100.0' start_line: 2460 end_line: 2472 + from_file: matched_length: 88 match_coverage: '100.0' matcher: 1-hash @@ -1362,6 +1380,7 @@ other_license_detections: - score: '100.0' start_line: 2475 end_line: 2479 + from_file: matched_length: 43 match_coverage: '100.0' matcher: 1-hash @@ -1381,6 +1400,7 @@ other_license_detections: - score: '90.0' start_line: 2482 end_line: 2483 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -1397,6 +1417,7 @@ other_license_detections: - score: '100.0' start_line: 2489 end_line: 2489 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1408,6 +1429,7 @@ other_license_detections: - score: '100.0' start_line: 2494 end_line: 2494 + from_file: matched_length: 5 match_coverage: '100.0' matcher: 2-aho @@ -1419,6 +1441,7 @@ other_license_detections: - score: '70.0' start_line: 2495 end_line: 2495 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1430,6 +1453,7 @@ other_license_detections: - score: '70.0' start_line: 2504 end_line: 2504 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 2-aho @@ -1444,6 +1468,7 @@ other_license_detections: - score: '100.0' start_line: 2508 end_line: 2532 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -1483,6 +1508,7 @@ other_license_detections: - score: '100.0' start_line: 2535 end_line: 2550 + from_file: matched_length: 121 match_coverage: '100.0' matcher: 1-hash @@ -1513,6 +1539,7 @@ other_license_detections: - score: '99.0' start_line: 2556 end_line: 2581 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -1553,6 +1580,7 @@ other_license_detections: - score: '100.0' start_line: 2583 end_line: 2583 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -1564,6 +1592,7 @@ other_license_detections: - score: '100.0' start_line: 2584 end_line: 2703 + from_file: matched_length: 981 match_coverage: '100.0' matcher: 1-hash @@ -1698,6 +1727,7 @@ other_license_detections: - score: '100.0' start_line: 2710 end_line: 2713 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 1-hash @@ -1716,6 +1746,7 @@ other_license_detections: - score: '100.0' start_line: 2716 end_line: 2840 + from_file: matched_length: 947 match_coverage: '100.0' matcher: 1-hash @@ -1855,6 +1886,7 @@ other_license_detections: - score: '100.0' start_line: 22 end_line: 29 + from_file: matched_length: 49 match_coverage: '100.0' matcher: 2-aho @@ -1877,6 +1909,7 @@ other_license_detections: - score: '100.0' start_line: 49 end_line: 49 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1891,6 +1924,7 @@ other_license_detections: - score: '100.0' start_line: 56 end_line: 56 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1905,6 +1939,7 @@ other_license_detections: - score: '100.0' start_line: 64 end_line: 64 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -1919,6 +1954,7 @@ other_license_detections: - score: '100.0' start_line: 74 end_line: 74 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 2-aho @@ -1933,6 +1969,7 @@ other_license_detections: - score: '100.0' start_line: 105 end_line: 106 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 2-aho @@ -1949,6 +1986,7 @@ other_license_detections: - score: '100.0' start_line: 118 end_line: 119 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -1965,6 +2003,7 @@ other_license_detections: - score: '100.0' start_line: 147 end_line: 147 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -1979,6 +2018,7 @@ other_license_detections: - score: '100.0' start_line: 157 end_line: 159 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -1996,6 +2036,7 @@ other_license_detections: - score: '100.0' start_line: 167 end_line: 168 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2012,6 +2053,7 @@ other_license_detections: - score: '100.0' start_line: 175 end_line: 176 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2028,6 +2070,7 @@ other_license_detections: - score: '100.0' start_line: 183 end_line: 183 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2042,6 +2085,7 @@ other_license_detections: - score: '90.91' start_line: '190' end_line: '190' + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -2056,6 +2100,7 @@ other_license_detections: - score: '91.67' start_line: '198' end_line: '198' + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2070,6 +2115,7 @@ other_license_detections: - score: '100.0' start_line: 208 end_line: 209 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 2-aho @@ -2086,6 +2132,7 @@ other_license_detections: - score: '100.0' start_line: 223 end_line: 224 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2102,6 +2149,7 @@ other_license_detections: - score: '100.0' start_line: 233 end_line: 234 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2118,6 +2166,7 @@ other_license_detections: - score: '100.0' start_line: 241 end_line: 242 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2134,6 +2183,7 @@ other_license_detections: - score: '100.0' start_line: 249 end_line: 250 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2150,6 +2200,7 @@ other_license_detections: - score: '100.0' start_line: 257 end_line: 258 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2166,6 +2217,7 @@ other_license_detections: - score: '100.0' start_line: 267 end_line: 268 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2182,6 +2234,7 @@ other_license_detections: - score: '100.0' start_line: 275 end_line: 275 + from_file: matched_length: 10 match_coverage: '100.0' matcher: 1-hash @@ -2196,6 +2249,7 @@ other_license_detections: - score: '99.0' start_line: 309 end_line: 310 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2212,6 +2266,7 @@ other_license_detections: - score: '100.0' start_line: 316 end_line: 317 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2228,6 +2283,7 @@ other_license_detections: - score: '100.0' start_line: 330 end_line: 330 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -2242,6 +2298,7 @@ other_license_detections: - score: '100.0' start_line: 336 end_line: 337 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 1-hash @@ -2258,6 +2315,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 347 + from_file: matched_length: 31 match_coverage: '100.0' matcher: 1-hash @@ -2275,6 +2333,7 @@ other_license_detections: - score: '100.0' start_line: 355 end_line: 356 + from_file: matched_length: 16 match_coverage: '100.0' matcher: 1-hash @@ -2291,6 +2350,7 @@ other_license_detections: - score: '100.0' start_line: 362 end_line: 363 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2307,6 +2367,7 @@ other_license_detections: - score: '100.0' start_line: 382 end_line: 383 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2323,6 +2384,7 @@ other_license_detections: - score: '100.0' start_line: 395 end_line: 396 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2339,6 +2401,7 @@ other_license_detections: - score: '100.0' start_line: 402 end_line: 403 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2355,6 +2418,7 @@ other_license_detections: - score: '100.0' start_line: 411 end_line: 411 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -2369,6 +2433,7 @@ other_license_detections: - score: '100.0' start_line: 419 end_line: 420 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2385,6 +2450,7 @@ other_license_detections: - score: '100.0' start_line: 431 end_line: 432 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2401,6 +2467,7 @@ other_license_detections: - score: '100.0' start_line: 439 end_line: 440 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2417,6 +2484,7 @@ other_license_detections: - score: '100.0' start_line: 447 end_line: 448 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2433,6 +2501,7 @@ other_license_detections: - score: '100.0' start_line: 454 end_line: 455 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2449,6 +2518,7 @@ other_license_detections: - score: '100.0' start_line: 465 end_line: 466 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2465,6 +2535,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 476 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2481,6 +2552,7 @@ other_license_detections: - score: '100.0' start_line: 484 end_line: 485 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2497,6 +2569,7 @@ other_license_detections: - score: '100.0' start_line: 494 end_line: 495 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2513,6 +2586,7 @@ other_license_detections: - score: '100.0' start_line: 502 end_line: 503 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2529,6 +2603,7 @@ other_license_detections: - score: '100.0' start_line: 509 end_line: 510 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2545,6 +2620,7 @@ other_license_detections: - score: '100.0' start_line: 516 end_line: 517 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2561,6 +2637,7 @@ other_license_detections: - score: '100.0' start_line: 524 end_line: 525 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2577,6 +2654,7 @@ other_license_detections: - score: '100.0' start_line: 531 end_line: 532 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2593,6 +2671,7 @@ other_license_detections: - score: '100.0' start_line: 539 end_line: 545 + from_file: matched_length: 61 match_coverage: '100.0' matcher: 1-hash @@ -2614,6 +2693,7 @@ other_license_detections: - score: '100.0' start_line: 553 end_line: 554 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2630,6 +2710,7 @@ other_license_detections: - score: '100.0' start_line: 561 end_line: 570 + from_file: matched_length: 71 match_coverage: '100.0' matcher: 2-aho @@ -2654,6 +2735,7 @@ other_license_detections: - score: '100.0' start_line: 578 end_line: 579 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2670,6 +2752,7 @@ other_license_detections: - score: '100.0' start_line: 585 end_line: 586 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2686,6 +2769,7 @@ other_license_detections: - score: '100.0' start_line: 600 end_line: 601 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -2702,6 +2786,7 @@ other_license_detections: - score: '100.0' start_line: 609 end_line: 610 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2718,6 +2803,7 @@ other_license_detections: - score: '100.0' start_line: 618 end_line: 619 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2734,6 +2820,7 @@ other_license_detections: - score: '100.0' start_line: 628 end_line: 629 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2750,6 +2837,7 @@ other_license_detections: - score: '100.0' start_line: 636 end_line: 640 + from_file: matched_length: 47 match_coverage: '100.0' matcher: 1-hash @@ -2769,6 +2857,7 @@ other_license_detections: - score: '100.0' start_line: 647 end_line: 648 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -2785,6 +2874,7 @@ other_license_detections: - score: '100.0' start_line: 655 end_line: 656 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2801,6 +2891,7 @@ other_license_detections: - score: '100.0' start_line: 663 end_line: 664 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2817,6 +2908,7 @@ other_license_detections: - score: '100.0' start_line: 673 end_line: 674 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2833,6 +2925,7 @@ other_license_detections: - score: '100.0' start_line: 681 end_line: 682 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2849,6 +2942,7 @@ other_license_detections: - score: '100.0' start_line: 690 end_line: 691 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2865,6 +2959,7 @@ other_license_detections: - score: '100.0' start_line: 698 end_line: 699 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -2881,6 +2976,7 @@ other_license_detections: - score: '100.0' start_line: 706 end_line: 707 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2897,6 +2993,7 @@ other_license_detections: - score: '100.0' start_line: 717 end_line: 718 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2913,6 +3010,7 @@ other_license_detections: - score: '100.0' start_line: 724 end_line: 725 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2929,6 +3027,7 @@ other_license_detections: - score: '100.0' start_line: 732 end_line: 734 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -2946,6 +3045,7 @@ other_license_detections: - score: '99.0' start_line: 748 end_line: 749 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -2962,6 +3062,7 @@ other_license_detections: - score: '100.0' start_line: 755 end_line: 756 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -2978,6 +3079,7 @@ other_license_detections: - score: '100.0' start_line: 763 end_line: 767 + from_file: matched_length: 34 match_coverage: '100.0' matcher: 2-aho @@ -2997,6 +3099,7 @@ other_license_detections: - score: '100.0' start_line: 775 end_line: 776 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3013,6 +3116,7 @@ other_license_detections: - score: '100.0' start_line: 784 end_line: 785 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -3026,6 +3130,7 @@ other_license_detections: - score: '100.0' start_line: 792 end_line: 801 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -3050,6 +3155,7 @@ other_license_detections: - score: '100.0' start_line: 809 end_line: 810 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3066,6 +3172,7 @@ other_license_detections: - score: '100.0' start_line: 817 end_line: 818 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3082,6 +3189,7 @@ other_license_detections: - score: '100.0' start_line: 825 end_line: 825 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -3096,6 +3204,7 @@ other_license_detections: - score: '100.0' start_line: 832 end_line: 833 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3112,6 +3221,7 @@ other_license_detections: - score: '100.0' start_line: 840 end_line: 841 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3128,6 +3238,7 @@ other_license_detections: - score: '100.0' start_line: 848 end_line: 850 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -3145,6 +3256,7 @@ other_license_detections: - score: '100.0' start_line: 857 end_line: 858 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3161,6 +3273,7 @@ other_license_detections: - score: '100.0' start_line: 866 end_line: 867 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3177,6 +3290,7 @@ other_license_detections: - score: '100.0' start_line: 875 end_line: 876 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3193,6 +3307,7 @@ other_license_detections: - score: '100.0' start_line: 919 end_line: 920 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3209,6 +3324,7 @@ other_license_detections: - score: '100.0' start_line: 927 end_line: 928 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3225,6 +3341,7 @@ other_license_detections: - score: '100.0' start_line: 935 end_line: 936 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3241,6 +3358,7 @@ other_license_detections: - score: '100.0' start_line: 950 end_line: 954 + from_file: matched_length: 35 match_coverage: '100.0' matcher: 2-aho @@ -3257,6 +3375,7 @@ other_license_detections: - score: '100.0' start_line: 957 end_line: 961 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -3273,6 +3392,7 @@ other_license_detections: - score: '100.0' start_line: 965 end_line: 967 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 2-aho @@ -3290,6 +3410,7 @@ other_license_detections: - score: '100.0' start_line: 975 end_line: 977 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 2-aho @@ -3307,6 +3428,7 @@ other_license_detections: - score: '100.0' start_line: 984 end_line: 985 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3323,6 +3445,7 @@ other_license_detections: - score: '100.0' start_line: 992 end_line: 993 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3339,6 +3462,7 @@ other_license_detections: - score: '100.0' start_line: 1008 end_line: 1009 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3355,6 +3479,7 @@ other_license_detections: - score: '100.0' start_line: 1029 end_line: 1030 + from_file: matched_length: 18 match_coverage: '100.0' matcher: 1-hash @@ -3371,6 +3496,7 @@ other_license_detections: - score: '100.0' start_line: 1037 end_line: 1038 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3387,6 +3513,7 @@ other_license_detections: - score: '100.0' start_line: 1045 end_line: 1046 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3403,6 +3530,7 @@ other_license_detections: - score: '100.0' start_line: 1054 end_line: 1055 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3419,6 +3547,7 @@ other_license_detections: - score: '100.0' start_line: 1063 end_line: 1064 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3435,6 +3564,7 @@ other_license_detections: - score: '100.0' start_line: 1072 end_line: 1073 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3451,6 +3581,7 @@ other_license_detections: - score: '100.0' start_line: 1080 end_line: 1081 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3467,6 +3598,7 @@ other_license_detections: - score: '100.0' start_line: 1096 end_line: 1097 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3483,6 +3615,7 @@ other_license_detections: - score: '100.0' start_line: 1104 end_line: 1105 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -3496,6 +3629,7 @@ other_license_detections: - score: '100.0' start_line: 1107 end_line: 1111 + from_file: matched_length: 53 match_coverage: '100.0' matcher: 2-aho @@ -3515,6 +3649,7 @@ other_license_detections: - score: '100.0' start_line: 1119 end_line: 1120 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3531,6 +3666,7 @@ other_license_detections: - score: '100.0' start_line: 1126 end_line: 1127 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3547,6 +3683,7 @@ other_license_detections: - score: '100.0' start_line: 1138 end_line: 1140 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -3564,6 +3701,7 @@ other_license_detections: - score: '100.0' start_line: 1148 end_line: 1149 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3580,6 +3718,7 @@ other_license_detections: - score: '99.0' start_line: 1156 end_line: 1159 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 1-hash @@ -3598,6 +3737,7 @@ other_license_detections: - score: '100.0' start_line: 1180 end_line: 1184 + from_file: matched_length: 33 match_coverage: '100.0' matcher: 1-hash @@ -3617,6 +3757,7 @@ other_license_detections: - score: '100.0' start_line: 1191 end_line: 1192 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3633,6 +3774,7 @@ other_license_detections: - score: '100.0' start_line: 1198 end_line: 1199 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -3649,6 +3791,7 @@ other_license_detections: - score: '99.0' start_line: 1208 end_line: 1208 + from_file: matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -3660,6 +3803,7 @@ other_license_detections: - score: '70.0' start_line: 1209 end_line: 1210 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -3676,6 +3820,7 @@ other_license_detections: - score: '100.0' start_line: 1218 end_line: 1219 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3692,6 +3837,7 @@ other_license_detections: - score: '100.0' start_line: 1226 end_line: 1226 + from_file: matched_length: 13 match_coverage: '100.0' matcher: 2-aho @@ -3706,6 +3852,7 @@ other_license_detections: - score: '100.0' start_line: 1236 end_line: 1237 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3722,6 +3869,7 @@ other_license_detections: - score: '100.0' start_line: 1248 end_line: 1252 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 2-aho @@ -3741,6 +3889,7 @@ other_license_detections: - score: '100.0' start_line: 1262 end_line: 1263 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3757,6 +3906,7 @@ other_license_detections: - score: '100.0' start_line: 1271 end_line: 1272 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3773,6 +3923,7 @@ other_license_detections: - score: '100.0' start_line: 1279 end_line: 1280 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3789,6 +3940,7 @@ other_license_detections: - score: '100.0' start_line: 1288 end_line: 1289 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3805,6 +3957,7 @@ other_license_detections: - score: '100.0' start_line: 1297 end_line: 1298 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -3818,6 +3971,7 @@ other_license_detections: - score: '100.0' start_line: 1300 end_line: 1301 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 2-aho @@ -3834,6 +3988,7 @@ other_license_detections: - score: '100.0' start_line: 1308 end_line: 1309 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3850,6 +4005,7 @@ other_license_detections: - score: '100.0' start_line: 1315 end_line: 1316 + from_file: matched_length: 24 match_coverage: '100.0' matcher: 1-hash @@ -3866,6 +4022,7 @@ other_license_detections: - score: '100.0' start_line: 1324 end_line: 1325 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3882,6 +4039,7 @@ other_license_detections: - score: '100.0' start_line: 1332 end_line: 1333 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -3898,6 +4056,7 @@ other_license_detections: - score: '100.0' start_line: 1340 end_line: 1341 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3914,6 +4073,7 @@ other_license_detections: - score: '100.0' start_line: 1349 end_line: 1350 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -3927,6 +4087,7 @@ other_license_detections: - score: '100.0' start_line: 1353 end_line: 1355 + from_file: matched_length: 27 match_coverage: '100.0' matcher: 2-aho @@ -3944,6 +4105,7 @@ other_license_detections: - score: '100.0' start_line: 1361 end_line: 1361 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -3958,6 +4120,7 @@ other_license_detections: - score: '100.0' start_line: 1368 end_line: 1369 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -3974,6 +4137,7 @@ other_license_detections: - score: '100.0' start_line: 1375 end_line: 1375 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -3988,6 +4152,7 @@ other_license_detections: - score: '100.0' start_line: 1382 end_line: 1383 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4004,6 +4169,7 @@ other_license_detections: - score: '100.0' start_line: 1390 end_line: 1390 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -4018,6 +4184,7 @@ other_license_detections: - score: '100.0' start_line: 1397 end_line: 1398 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4034,6 +4201,7 @@ other_license_detections: - score: '100.0' start_line: 1409 end_line: 1410 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4050,6 +4218,7 @@ other_license_detections: - score: '100.0' start_line: 1417 end_line: 1418 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4066,6 +4235,7 @@ other_license_detections: - score: '100.0' start_line: 1427 end_line: 1433 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -4087,6 +4257,7 @@ other_license_detections: - score: '100.0' start_line: 1456 end_line: 1457 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4103,6 +4274,7 @@ other_license_detections: - score: '100.0' start_line: 1467 end_line: 1468 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4119,6 +4291,7 @@ other_license_detections: - score: '100.0' start_line: 1476 end_line: 1477 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4135,6 +4308,7 @@ other_license_detections: - score: '100.0' start_line: 1487 end_line: 1488 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4151,6 +4325,7 @@ other_license_detections: - score: '100.0' start_line: 1497 end_line: 1498 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4167,6 +4342,7 @@ other_license_detections: - score: '100.0' start_line: 1517 end_line: 1518 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4183,6 +4359,7 @@ other_license_detections: - score: '100.0' start_line: 1527 end_line: 1529 + from_file: matched_length: 30 match_coverage: '100.0' matcher: 1-hash @@ -4200,6 +4377,7 @@ other_license_detections: - score: '100.0' start_line: 1539 end_line: 1540 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4216,6 +4394,7 @@ other_license_detections: - score: '100.0' start_line: 1547 end_line: 1548 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4232,6 +4411,7 @@ other_license_detections: - score: '100.0' start_line: 1556 end_line: 1557 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4248,6 +4428,7 @@ other_license_detections: - score: '95.0' start_line: 1566 end_line: 1567 + from_file: matched_length: 21 match_coverage: '100.0' matcher: 1-hash @@ -4264,6 +4445,7 @@ other_license_detections: - score: '100.0' start_line: 1574 end_line: 1575 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4280,6 +4462,7 @@ other_license_detections: - score: '100.0' start_line: 1582 end_line: 1583 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 1-hash @@ -4296,6 +4479,7 @@ other_license_detections: - score: '100.0' start_line: 1590 end_line: 1591 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4312,6 +4496,7 @@ other_license_detections: - score: '95.0' start_line: 1598 end_line: 1600 + from_file: matched_length: 29 match_coverage: '100.0' matcher: 1-hash @@ -4329,6 +4514,7 @@ other_license_detections: - score: '95.0' start_line: 1609 end_line: 1609 + from_file: matched_length: 15 match_coverage: '100.0' matcher: 1-hash @@ -4344,6 +4530,7 @@ other_license_detections: - score: '100.0' start_line: 1616 end_line: 1617 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4360,6 +4547,7 @@ other_license_detections: - score: '100.0' start_line: 1624 end_line: 1626 + from_file: matched_length: 11 match_coverage: '100.0' matcher: 1-hash @@ -4377,6 +4565,7 @@ other_license_detections: - score: '100.0' start_line: 1633 end_line: 1634 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4393,6 +4582,7 @@ other_license_detections: - score: '90.0' start_line: 1641 end_line: 1641 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 2-aho @@ -4407,6 +4597,7 @@ other_license_detections: - score: '95.0' start_line: 1661 end_line: 1662 + from_file: matched_length: 22 match_coverage: '100.0' matcher: 1-hash @@ -4423,6 +4614,7 @@ other_license_detections: - score: '95.0' start_line: 1670 end_line: 1671 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -4436,6 +4628,7 @@ other_license_detections: - score: '100.0' start_line: 1679 end_line: 1680 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 2-aho @@ -4452,6 +4645,7 @@ other_license_detections: - score: '100.0' start_line: 1687 end_line: 1689 + from_file: matched_length: 40 match_coverage: '100.0' matcher: 1-hash @@ -4469,6 +4663,7 @@ other_license_detections: - score: '100.0' start_line: 1696 end_line: 1697 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4485,6 +4680,7 @@ other_license_detections: - score: '100.0' start_line: 1705 end_line: 1706 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4501,6 +4697,7 @@ other_license_detections: - score: '99.0' start_line: 1712 end_line: 1712 + from_file: matched_length: 8 match_coverage: '100.0' matcher: 1-hash @@ -4515,6 +4712,7 @@ other_license_detections: - score: '100.0' start_line: 1723 end_line: 1724 + from_file: matched_length: 23 match_coverage: '100.0' matcher: 1-hash @@ -4531,6 +4729,7 @@ other_license_detections: - score: '100.0' start_line: 1734 end_line: 1735 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4547,6 +4746,7 @@ other_license_detections: - score: '100.0' start_line: 1742 end_line: 1743 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4563,6 +4763,7 @@ other_license_detections: - score: '100.0' start_line: 1761 end_line: 1761 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4577,6 +4778,7 @@ other_license_detections: - score: '100.0' start_line: 1768 end_line: 1769 + from_file: matched_length: 14 match_coverage: '100.0' matcher: 1-hash @@ -4593,6 +4795,7 @@ other_license_detections: - score: '100.0' start_line: 1778 end_line: 1779 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4606,6 +4809,7 @@ other_license_detections: - score: '100.0' start_line: 1781 end_line: 1785 + from_file: matched_length: 56 match_coverage: '100.0' matcher: 2-aho @@ -4625,6 +4829,7 @@ other_license_detections: - score: '100.0' start_line: 1794 end_line: 1796 + from_file: matched_length: 39 match_coverage: '100.0' matcher: 1-hash @@ -4642,6 +4847,7 @@ other_license_detections: - score: '100.0' start_line: 1805 end_line: 1805 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4656,6 +4862,7 @@ other_license_detections: - score: '100.0' start_line: 1814 end_line: 1814 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4670,6 +4877,7 @@ other_license_detections: - score: '100.0' start_line: 1821 end_line: 1821 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4684,6 +4892,7 @@ other_license_detections: - score: '100.0' start_line: 1836 end_line: 1837 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4700,6 +4909,7 @@ other_license_detections: - score: '100.0' start_line: 1844 end_line: 1845 + from_file: matched_length: '19' match_coverage: '100.0' matcher: 2-aho @@ -4713,6 +4923,7 @@ other_license_detections: - score: '100.0' start_line: 1847 end_line: 1851 + from_file: matched_length: 53 match_coverage: '100.0' matcher: 2-aho @@ -4732,6 +4943,7 @@ other_license_detections: - score: '100.0' start_line: 1861 end_line: 1861 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4746,6 +4958,7 @@ other_license_detections: - score: '100.0' start_line: 1868 end_line: 1868 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4760,6 +4973,7 @@ other_license_detections: - score: '100.0' start_line: 1875 end_line: 1875 + from_file: matched_length: 12 match_coverage: '100.0' matcher: 1-hash @@ -4774,6 +4988,7 @@ other_license_detections: - score: '100.0' start_line: 1891 end_line: 1892 + from_file: matched_length: 20 match_coverage: '100.0' matcher: 1-hash @@ -4790,6 +5005,7 @@ other_license_detections: - score: '100.0' start_line: '1913' end_line: '1928' + from_file: matched_length: 103 match_coverage: '100.0' matcher: 2-aho @@ -4820,6 +5036,7 @@ other_license_detections: - score: '100.0' start_line: '1942' end_line: '1944' + from_file: matched_length: 21 match_coverage: '100.0' matcher: 2-aho @@ -4837,6 +5054,7 @@ other_license_detections: - score: '100.0' start_line: '1969' end_line: '1993' + from_file: matched_length: 213 match_coverage: '100.0' matcher: 2-aho @@ -4876,6 +5094,7 @@ other_license_detections: - score: '100.0' start_line: 2000 end_line: 2007 + from_file: matched_length: 49 match_coverage: '100.0' matcher: 1-hash @@ -4898,6 +5117,7 @@ other_license_detections: - score: '95.0' start_line: 2020 end_line: 2023 + from_file: matched_length: 26 match_coverage: '100.0' matcher: 2-aho 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 e66fccc19ff..d2c0de42b1a 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 @@ -9,6 +9,7 @@ license_detections: - score: '98.28' start_line: 11 end_line: 17 + from_file: matched_length: 57 match_coverage: '100.0' matcher: 2-aho @@ -27,6 +28,7 @@ license_detections: - score: '96.97' start_line: '19' end_line: 21 + from_file: matched_length: 32 match_coverage: '100.0' matcher: 2-aho 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 ca07a4d0367..56979981f35 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 @@ -14,6 +14,7 @@ other_license_detections: - score: '100.0' start_line: 33 end_line: 33 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -25,6 +26,7 @@ other_license_detections: - score: '100.0' start_line: 34 end_line: 48 + from_file: matched_length: 124 match_coverage: '100.0' matcher: 1-hash 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 d792318c7e1..35a287d3ed1 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 @@ -9,6 +9,7 @@ license_detections: - score: '100.0' start_line: 20 end_line: 26 + from_file: matched_length: 65 match_coverage: '100.0' matcher: 2-aho @@ -27,6 +28,7 @@ license_detections: - score: '100.0' start_line: 32 end_line: 38 + from_file: matched_length: 65 match_coverage: '100.0' matcher: 2-aho 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 d7254b30df9..1bb29a6a522 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 @@ -76,6 +76,7 @@ other_license_detections: - score: '100.0' start_line: 345 end_line: 346 + from_file: matched_length: 17 match_coverage: '100.0' matcher: 2-aho @@ -92,6 +93,7 @@ other_license_detections: - score: '100.0' start_line: 350 end_line: 350 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -103,6 +105,7 @@ other_license_detections: - score: '100.0' start_line: 351 end_line: 365 + from_file: matched_length: 125 match_coverage: '100.0' matcher: 1-hash @@ -132,6 +135,7 @@ other_license_detections: - score: '100.0' start_line: 367 end_line: 367 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 368 end_line: 383 + from_file: matched_length: 137 match_coverage: '100.0' matcher: 1-hash @@ -173,6 +178,7 @@ other_license_detections: - score: '100.0' start_line: 385 end_line: 385 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -184,6 +190,7 @@ other_license_detections: - score: '100.0' start_line: 386 end_line: 400 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -213,6 +220,7 @@ other_license_detections: - score: '100.0' start_line: 403 end_line: 410 + from_file: matched_length: 70 match_coverage: '100.0' matcher: 1-hash @@ -235,6 +243,7 @@ other_license_detections: - score: '100.0' start_line: 413 end_line: 437 + from_file: matched_length: 215 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +283,7 @@ other_license_detections: - score: '100.0' start_line: 440 end_line: 466 + from_file: matched_length: 243 match_coverage: '100.0' matcher: 1-hash @@ -315,6 +325,7 @@ other_license_detections: - score: '100.0' start_line: 468 end_line: 468 + from_file: matched_length: 2 match_coverage: '100.0' matcher: 1-hash @@ -326,6 +337,7 @@ other_license_detections: - score: '100.0' start_line: 469 end_line: 473 + from_file: matched_length: 37 match_coverage: '100.0' matcher: 1-hash @@ -345,6 +357,7 @@ other_license_detections: - score: '100.0' start_line: 475 end_line: 475 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -356,6 +369,7 @@ other_license_detections: - score: '100.0' start_line: 476 end_line: 490 + from_file: matched_length: 126 match_coverage: '100.0' matcher: 1-hash @@ -385,6 +399,7 @@ other_license_detections: - score: '100.0' start_line: 492 end_line: 492 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -396,6 +411,7 @@ other_license_detections: - score: '100.0' start_line: 493 end_line: 508 + from_file: matched_length: 141 match_coverage: '100.0' matcher: 1-hash @@ -426,6 +442,7 @@ other_license_detections: - score: '100.0' start_line: 510 end_line: 510 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -437,6 +454,7 @@ other_license_detections: - score: '100.0' start_line: 511 end_line: 525 + from_file: matched_length: 127 match_coverage: '100.0' matcher: 1-hash @@ -466,6 +484,7 @@ other_license_detections: - score: '100.0' start_line: 528 end_line: 546 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 22398ceaf7e..d8f22d0950c 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 @@ -15,6 +15,7 @@ other_license_detections: - score: '100.0' start_line: 57 end_line: 74 + from_file: matched_length: 144 match_coverage: '100.0' matcher: 2-aho 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 4b180afc4f4..716755b790b 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 @@ -38,6 +38,7 @@ other_license_detections: - score: '100.0' start_line: 71 end_line: 71 + from_file: matched_length: 4 match_coverage: '100.0' matcher: 1-hash @@ -49,6 +50,7 @@ other_license_detections: - score: '100.0' start_line: 72 end_line: 88 + from_file: matched_length: 145 match_coverage: '100.0' matcher: 1-hash @@ -80,6 +82,7 @@ other_license_detections: - score: '100.0' start_line: 94 end_line: 103 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -104,6 +107,7 @@ other_license_detections: - score: '100.0' start_line: 118 end_line: 142 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 2-aho @@ -143,6 +147,7 @@ other_license_detections: - score: '100.0' start_line: 172 end_line: '191' + from_file: matched_length: 168 match_coverage: '100.0' matcher: 2-aho @@ -174,6 +179,7 @@ other_license_detections: - score: '100.0' start_line: '197' end_line: 206 + from_file: matched_length: 87 match_coverage: '100.0' matcher: 2-aho @@ -198,6 +204,7 @@ other_license_detections: - score: '100.0' start_line: 209 end_line: 209 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -209,6 +216,7 @@ other_license_detections: - score: '99.0' start_line: 210 end_line: 222 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -236,6 +244,7 @@ other_license_detections: - score: '100.0' start_line: 224 end_line: 224 + from_file: matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -247,6 +256,7 @@ other_license_detections: - score: '100.0' start_line: 225 end_line: 237 + from_file: matched_length: 105 match_coverage: '100.0' matcher: 1-hash @@ -274,6 +284,7 @@ other_license_detections: - score: '100.0' start_line: 240 end_line: 272 + from_file: matched_length: 211 match_coverage: '100.0' matcher: 1-hash @@ -321,6 +332,7 @@ other_license_detections: - score: '100.0' start_line: 279 end_line: 302 + from_file: matched_length: 217 match_coverage: '100.0' matcher: 2-aho @@ -359,6 +371,7 @@ other_license_detections: - score: '100.0' start_line: 306 end_line: 309 + from_file: matched_length: 47 match_coverage: '100.0' matcher: 2-aho @@ -374,6 +387,7 @@ other_license_detections: - score: '100.0' start_line: 317 end_line: 335 + from_file: matched_length: 148 match_coverage: '100.0' matcher: 2-aho @@ -407,6 +421,7 @@ other_license_detections: - score: '100.0' start_line: 370 end_line: 391 + from_file: matched_length: 208 match_coverage: '100.0' matcher: 1-hash @@ -443,6 +458,7 @@ other_license_detections: - score: '100.0' start_line: 395 end_line: 419 + from_file: matched_length: 214 match_coverage: '100.0' matcher: 1-hash @@ -482,6 +498,7 @@ other_license_detections: - score: '100.0' start_line: 422 end_line: 433 + from_file: matched_length: 106 match_coverage: '100.0' matcher: 2-aho @@ -508,6 +525,7 @@ other_license_detections: - score: '100.0' start_line: 439 end_line: 454 + from_file: matched_length: 161 match_coverage: '100.0' matcher: 1-hash 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 fe4af469c0b..00f92cb3645 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 @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -64,6 +65,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -83,6 +85,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -102,6 +105,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -217,6 +221,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -236,6 +241,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -255,6 +261,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -274,6 +281,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -451,6 +459,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -464,6 +473,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -477,6 +487,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", @@ -574,6 +585,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -587,6 +599,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -600,6 +613,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", 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 025f15cfefa..6221d2eeafc 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 @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -65,6 +66,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -84,6 +86,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -103,6 +106,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -230,6 +234,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -243,6 +248,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -256,6 +262,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", @@ -403,6 +410,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -422,6 +430,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -441,6 +450,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -460,6 +470,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -542,6 +553,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -555,6 +567,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -568,6 +581,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected index a02a1d05fe6..eac39a80a9e 100644 --- a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected index 6c84cf11561..39598f10057 100644 --- a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected index bd4961cb27a..0fbf7e04ac1 100644 --- a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -66,6 +67,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected index 6ebbc02da33..30b06391d44 100644 --- a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -66,6 +67,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -85,6 +87,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected index 79dbd93fc55..4a7ecaf001a 100644 --- a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected @@ -47,6 +47,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -66,6 +67,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/haxe/basic/haxelib.json.expected b/tests/packagedcode/data/haxe/basic/haxelib.json.expected index 5d7c6d033bb..31229971428 100644 --- a/tests/packagedcode/data/haxe/basic/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/basic/haxelib.json.expected @@ -79,6 +79,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected index 72154bf018c..7f49ccf4bc9 100644 --- a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/haxe/deps/haxelib.json.expected b/tests/packagedcode/data/haxe/deps/haxelib.json.expected index 32e605e5509..eaf6c469e67 100644 --- a/tests/packagedcode/data/haxe/deps/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/deps/haxelib.json.expected @@ -54,6 +54,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/haxe/tags/haxelib.json.expected b/tests/packagedcode/data/haxe/tags/haxelib.json.expected index 3e32cbf27b2..ed20bf92d36 100644 --- a/tests/packagedcode/data/haxe/tags/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/tags/haxelib.json.expected @@ -51,6 +51,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 75ae6bc2c63..01ee518d566 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 @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -123,6 +124,7 @@ "score": 100.0, "start_line": 3, "end_line": 19, + "from_file": "pypi-with-test-manifests/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -209,6 +211,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pypi-with-test-manifests/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -253,6 +256,7 @@ "score": 100.0, "start_line": 14, "end_line": 14, + "from_file": "pypi-with-test-manifests/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -271,6 +275,7 @@ "score": 100.0, "start_line": 26, "end_line": 26, + "from_file": "pypi-with-test-manifests/PKG-INFO", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -283,6 +288,7 @@ "score": 100.0, "start_line": 3, "end_line": 19, + "from_file": "pypi-with-test-manifests/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -416,6 +422,7 @@ "score": 100.0, "start_line": 3, "end_line": 19, + "from_file": "pypi-with-test-manifests/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -500,6 +507,7 @@ "score": 100.0, "start_line": 12, "end_line": 12, + "from_file": "pypi-with-test-manifests/setup.cfg", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -812,6 +820,7 @@ "score": 100.0, "start_line": 12, "end_line": 12, + "from_file": "pypi-with-test-manifests/setup.cfg", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -866,6 +875,7 @@ "score": 100.0, "start_line": 3, "end_line": 19, + "from_file": "pypi-with-test-manifests/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 32b4ce017c1..f4fcb8bb92f 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 @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -163,6 +164,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 2c3d445d1aa..131496f5f4c 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", @@ -184,6 +185,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json index 2c3d445d1aa..131496f5f4c 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", @@ -184,6 +185,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", 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 4122635a3a2..aa11ccdf9aa 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", @@ -55,6 +56,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/LICENSE.rst", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -182,6 +184,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/LICENSE.rst", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -259,6 +262,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/setup.cfg", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", @@ -272,6 +276,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/LICENSE.rst", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -327,6 +332,7 @@ "score": 100.0, "start_line": 13, "end_line": 14, + "from_file": "pypi/setup.cfg", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -339,6 +345,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/LICENSE.rst", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -360,6 +367,7 @@ "score": 99.0, "start_line": 25, "end_line": 25, + "from_file": "pypi/setup.cfg", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -415,6 +423,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "pypi/LICENSE.rst", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 8e24930717c..e8ce20cfc1b 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 @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, + "from_file": null, "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -277,6 +278,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, + "from_file": "activemq-camel/activemq-camel-pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -435,6 +437,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, + "from_file": "activemq-camel/activemq-camel-pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", 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 287d86bf22d..7c6e42c1a73 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 @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 3, "end_line": 28, + "from_file": "google-built-collection/LICENSE", "matched_length": 212, "match_coverage": 100.0, "matcher": "2-aho", @@ -136,6 +137,7 @@ "score": 100.0, "start_line": 3, "end_line": 28, + "from_file": "google-built-collection/LICENSE", "matched_length": 212, "match_coverage": 100.0, "matcher": "2-aho", @@ -192,6 +194,7 @@ "score": 100.0, "start_line": 3, "end_line": 28, + "from_file": "google-built-collection/LICENSE", "matched_length": 212, "match_coverage": 100.0, "matcher": "2-aho", 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 caeb24426fe..9ca21ab15a5 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 @@ -60,6 +60,7 @@ "score": 94.81, "start_line": 12, "end_line": 21, + "from_file": "jquery-form-3.51.0/README.md", "matched_length": 128, "match_coverage": 94.81, "matcher": "3-seq", @@ -142,6 +143,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -161,6 +163,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -239,6 +242,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -258,6 +262,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -277,6 +282,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -296,6 +302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -516,6 +523,7 @@ "score": 94.81, "start_line": 12, "end_line": 21, + "from_file": "jquery-form-3.51.0/README.md", "matched_length": 128, "match_coverage": 94.81, "matcher": "3-seq", @@ -572,6 +580,7 @@ "score": 94.81, "start_line": 12, "end_line": 21, + "from_file": "jquery-form-3.51.0/README.md", "matched_length": 128, "match_coverage": 94.81, "matcher": "3-seq", @@ -682,6 +691,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/composer.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -701,6 +711,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/composer.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -760,6 +771,7 @@ "score": 100.0, "start_line": 21, "end_line": 23, + "from_file": "jquery-form-3.51.0/composer.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -773,6 +785,7 @@ "score": 100.0, "start_line": 23, "end_line": 23, + "from_file": "jquery-form-3.51.0/composer.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -841,6 +854,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -860,6 +874,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -879,6 +894,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -898,6 +914,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jquery-form-3.51.0/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1006,6 +1023,7 @@ "score": 100.0, "start_line": 17, "end_line": 22, + "from_file": "jquery-form-3.51.0/package.json", "matched_length": 21, "match_coverage": 100.0, "matcher": "2-aho", 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 0b89a2b0498..ada563f4c12 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 @@ -42,6 +42,7 @@ "score": 16.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -55,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "fizzler/COPYING.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -68,6 +70,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fizzler/COPYING.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -180,6 +183,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "fizzler/COPYING.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -193,6 +197,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fizzler/COPYING.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -257,6 +262,7 @@ "score": 16.0, "start_line": 1, "end_line": 1, + "from_file": "fizzler/Fizzler.nuspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -270,6 +276,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "fizzler/COPYING.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -283,6 +290,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fizzler/COPYING.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -355,6 +363,7 @@ "score": 33.0, "start_line": 9, "end_line": 9, + "from_file": "fizzler/Fizzler.nuspec", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -368,6 +377,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "fizzler/COPYING.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -381,6 +391,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fizzler/COPYING.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 0b093616e64..83436d9d4b1 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -55,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -68,6 +70,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -137,6 +140,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -150,6 +154,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -214,6 +219,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -227,6 +233,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -240,6 +247,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -285,6 +293,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -298,6 +307,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -311,6 +321,7 @@ "score": 100.0, "start_line": 5, "end_line": 21, + "from_file": "flutter_playtabs_bridge/LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 909f56f8121..d2db45eba94 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -130,6 +131,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 b32fe464e59..725614b0115 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -55,6 +56,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "nanopb/LICENSE.txt", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -124,6 +126,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "nanopb/LICENSE.txt", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -188,6 +191,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "nanopb/nanopb.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -201,6 +205,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "nanopb/LICENSE.txt", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -246,6 +251,7 @@ "score": 100.0, "start_line": 14, "end_line": 14, + "from_file": "nanopb/nanopb.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -259,6 +265,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "nanopb/LICENSE.txt", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", 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 0f986dbbc78..8f3341ced70 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -130,6 +131,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f5cd867791d..856c5abbc76 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 @@ -54,6 +54,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "base-example/django.po", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -165,6 +166,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "base-example/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -209,6 +211,7 @@ "score": 99.0, "start_line": 16, "end_line": 16, + "from_file": "base-example/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -244,6 +247,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "base-example/django.po", "matched_length": 11, "match_coverage": 100.0, "matcher": "2-aho", @@ -257,6 +261,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "base-example/django.po", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 4139cefc08b..91b9f0a562c 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 @@ -5187,6 +5187,7 @@ "score": 4.71, "start_line": 1, "end_line": 3, + "from_file": "fusiondirectory/debian/README.multi-orig-tarball-package", "matched_length": 4, "match_coverage": 4.71, "matcher": "3-seq", @@ -5360,6 +5361,7 @@ "score": 100.0, "start_line": 297, "end_line": 297, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5380,6 +5382,7 @@ "score": 100.0, "start_line": 411, "end_line": 411, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5393,6 +5396,7 @@ "score": 100.0, "start_line": 413, "end_line": 413, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -5413,6 +5417,7 @@ "score": 100.0, "start_line": 427, "end_line": 427, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5433,6 +5438,7 @@ "score": 100.0, "start_line": 433, "end_line": 433, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5453,6 +5459,7 @@ "score": 100.0, "start_line": 441, "end_line": 441, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -5473,6 +5480,7 @@ "score": 100.0, "start_line": 452, "end_line": 452, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5493,6 +5501,7 @@ "score": 100.0, "start_line": 461, "end_line": 461, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5513,6 +5522,7 @@ "score": 100.0, "start_line": 475, "end_line": 475, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5533,6 +5543,7 @@ "score": 100.0, "start_line": 488, "end_line": 488, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5553,6 +5564,7 @@ "score": 100.0, "start_line": 495, "end_line": 495, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5573,6 +5585,7 @@ "score": 100.0, "start_line": 503, "end_line": 503, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5593,6 +5606,7 @@ "score": 100.0, "start_line": 560, "end_line": 560, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5606,6 +5620,7 @@ "score": 100.0, "start_line": 562, "end_line": 562, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -5626,6 +5641,7 @@ "score": 100.0, "start_line": 968, "end_line": 968, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5646,6 +5662,7 @@ "score": 99.0, "start_line": 1094, "end_line": 1094, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5669,6 +5686,7 @@ "score": 100.0, "start_line": 1099, "end_line": 1099, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -5692,6 +5710,7 @@ "score": 100.0, "start_line": 1413, "end_line": 1413, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5715,6 +5734,7 @@ "score": 100.0, "start_line": 1423, "end_line": 1423, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5738,6 +5758,7 @@ "score": 100.0, "start_line": 1429, "end_line": 1429, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -5761,6 +5782,7 @@ "score": 100.0, "start_line": 1437, "end_line": 1437, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5784,6 +5806,7 @@ "score": 100.0, "start_line": 1443, "end_line": 1443, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5807,6 +5830,7 @@ "score": 100.0, "start_line": 1449, "end_line": 1449, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5830,6 +5854,7 @@ "score": 100.0, "start_line": 1457, "end_line": 1457, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5853,6 +5878,7 @@ "score": 100.0, "start_line": 1463, "end_line": 1463, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5876,6 +5902,7 @@ "score": 100.0, "start_line": 1469, "end_line": 1469, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5899,6 +5926,7 @@ "score": 100.0, "start_line": 1475, "end_line": 1475, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5922,6 +5950,7 @@ "score": 100.0, "start_line": 1481, "end_line": 1481, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5945,6 +5974,7 @@ "score": 100.0, "start_line": 1487, "end_line": 1487, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5968,6 +5998,7 @@ "score": 100.0, "start_line": 1493, "end_line": 1493, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -5991,6 +6022,7 @@ "score": 100.0, "start_line": 1501, "end_line": 1501, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -6011,6 +6043,7 @@ "score": 100.0, "start_line": 1507, "end_line": 1507, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6034,6 +6067,7 @@ "score": 100.0, "start_line": 1513, "end_line": 1513, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6057,6 +6091,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6070,6 +6105,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6083,6 +6119,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6096,6 +6133,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6109,6 +6147,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6122,6 +6161,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6135,6 +6175,7 @@ "score": 100.0, "start_line": 1523, "end_line": 1523, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6148,6 +6189,7 @@ "score": 100.0, "start_line": 1524, "end_line": 1539, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 136, "match_coverage": 100.0, "matcher": "2-aho", @@ -6161,6 +6203,7 @@ "score": 100.0, "start_line": 1541, "end_line": 1541, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6174,6 +6217,7 @@ "score": 100.0, "start_line": 1542, "end_line": 1557, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 136, "match_coverage": 100.0, "matcher": "2-aho", @@ -6187,6 +6231,7 @@ "score": 100.0, "start_line": 1559, "end_line": 1559, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -6200,6 +6245,7 @@ "score": 100.0, "start_line": 1560, "end_line": 1577, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 146, "match_coverage": 100.0, "matcher": "2-aho", @@ -6213,6 +6259,7 @@ "score": 100.0, "start_line": 1579, "end_line": 1579, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6226,6 +6273,7 @@ "score": 100.0, "start_line": 1580, "end_line": 1596, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -6239,6 +6287,7 @@ "score": 100.0, "start_line": 1598, "end_line": 1598, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -6252,6 +6301,7 @@ "score": 100.0, "start_line": 1599, "end_line": 1621, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -6265,6 +6315,7 @@ "score": 100.0, "start_line": 1623, "end_line": 1623, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -6278,6 +6329,7 @@ "score": 100.0, "start_line": 1624, "end_line": 1649, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 236, "match_coverage": 100.0, "matcher": "2-aho", @@ -6291,6 +6343,7 @@ "score": 100.0, "start_line": 1651, "end_line": 1651, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6304,6 +6357,7 @@ "score": 100.0, "start_line": 1652, "end_line": 1663, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 105, "match_coverage": 100.0, "matcher": "2-aho", @@ -6317,6 +6371,7 @@ "score": 99.0, "start_line": 1665, "end_line": 1665, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -6330,6 +6385,7 @@ "score": 100.0, "start_line": 1666, "end_line": 1669, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 40, "match_coverage": 100.0, "matcher": "2-aho", @@ -6350,6 +6406,7 @@ "score": 100.0, "start_line": 2692, "end_line": 2692, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6370,6 +6427,7 @@ "score": 100.0, "start_line": 2804, "end_line": 2804, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6390,6 +6448,7 @@ "score": 100.0, "start_line": 2818, "end_line": 2818, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6410,6 +6469,7 @@ "score": 100.0, "start_line": 2844, "end_line": 2844, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6430,6 +6490,7 @@ "score": 100.0, "start_line": 2863, "end_line": 2863, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6450,6 +6511,7 @@ "score": 100.0, "start_line": 2873, "end_line": 2873, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6470,6 +6532,7 @@ "score": 100.0, "start_line": 2880, "end_line": 2880, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -6490,6 +6553,7 @@ "score": 100.0, "start_line": 2889, "end_line": 2889, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6510,6 +6574,7 @@ "score": 100.0, "start_line": 2903, "end_line": 2903, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6530,6 +6595,7 @@ "score": 100.0, "start_line": 2911, "end_line": 2911, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6550,6 +6616,7 @@ "score": 100.0, "start_line": 2919, "end_line": 2919, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6570,6 +6637,7 @@ "score": 100.0, "start_line": 2939, "end_line": 2939, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6590,6 +6658,7 @@ "score": 100.0, "start_line": 2945, "end_line": 2945, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6610,6 +6679,7 @@ "score": 100.0, "start_line": 2951, "end_line": 2951, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6630,6 +6700,7 @@ "score": 100.0, "start_line": 2959, "end_line": 2959, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6650,6 +6721,7 @@ "score": 100.0, "start_line": 2964, "end_line": 2964, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6670,6 +6742,7 @@ "score": 100.0, "start_line": 2970, "end_line": 2970, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6690,6 +6763,7 @@ "score": 100.0, "start_line": 2976, "end_line": 2976, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6710,6 +6784,7 @@ "score": 100.0, "start_line": 2982, "end_line": 2982, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6730,6 +6805,7 @@ "score": 100.0, "start_line": 2988, "end_line": 2988, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6750,6 +6826,7 @@ "score": 100.0, "start_line": 2993, "end_line": 2993, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6770,6 +6847,7 @@ "score": 100.0, "start_line": 2999, "end_line": 2999, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -6790,6 +6868,7 @@ "score": 100.0, "start_line": 3005, "end_line": 3005, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -11401,6 +11480,7 @@ "score": 100.0, "start_line": 297, "end_line": 297, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11421,6 +11501,7 @@ "score": 100.0, "start_line": 411, "end_line": 411, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11434,6 +11515,7 @@ "score": 100.0, "start_line": 413, "end_line": 413, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -11454,6 +11536,7 @@ "score": 100.0, "start_line": 427, "end_line": 427, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11474,6 +11557,7 @@ "score": 100.0, "start_line": 433, "end_line": 433, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11494,6 +11578,7 @@ "score": 100.0, "start_line": 441, "end_line": 441, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -11514,6 +11599,7 @@ "score": 100.0, "start_line": 452, "end_line": 452, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11534,6 +11620,7 @@ "score": 100.0, "start_line": 461, "end_line": 461, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11554,6 +11641,7 @@ "score": 100.0, "start_line": 475, "end_line": 475, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11574,6 +11662,7 @@ "score": 100.0, "start_line": 488, "end_line": 488, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11594,6 +11683,7 @@ "score": 100.0, "start_line": 495, "end_line": 495, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11614,6 +11704,7 @@ "score": 100.0, "start_line": 503, "end_line": 503, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11634,6 +11725,7 @@ "score": 100.0, "start_line": 560, "end_line": 560, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11647,6 +11739,7 @@ "score": 100.0, "start_line": 562, "end_line": 562, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -11667,6 +11760,7 @@ "score": 100.0, "start_line": 968, "end_line": 968, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11687,6 +11781,7 @@ "score": 99.0, "start_line": 1094, "end_line": 1094, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11710,6 +11805,7 @@ "score": 100.0, "start_line": 1099, "end_line": 1099, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -11733,6 +11829,7 @@ "score": 100.0, "start_line": 1413, "end_line": 1413, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11756,6 +11853,7 @@ "score": 100.0, "start_line": 1423, "end_line": 1423, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11779,6 +11877,7 @@ "score": 100.0, "start_line": 1429, "end_line": 1429, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -11802,6 +11901,7 @@ "score": 100.0, "start_line": 1437, "end_line": 1437, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11825,6 +11925,7 @@ "score": 100.0, "start_line": 1443, "end_line": 1443, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11848,6 +11949,7 @@ "score": 100.0, "start_line": 1449, "end_line": 1449, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11871,6 +11973,7 @@ "score": 100.0, "start_line": 1457, "end_line": 1457, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11894,6 +11997,7 @@ "score": 100.0, "start_line": 1463, "end_line": 1463, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11917,6 +12021,7 @@ "score": 100.0, "start_line": 1469, "end_line": 1469, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11940,6 +12045,7 @@ "score": 100.0, "start_line": 1475, "end_line": 1475, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11963,6 +12069,7 @@ "score": 100.0, "start_line": 1481, "end_line": 1481, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -11986,6 +12093,7 @@ "score": 100.0, "start_line": 1487, "end_line": 1487, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12009,6 +12117,7 @@ "score": 100.0, "start_line": 1493, "end_line": 1493, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12032,6 +12141,7 @@ "score": 100.0, "start_line": 1501, "end_line": 1501, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -12052,6 +12162,7 @@ "score": 100.0, "start_line": 1507, "end_line": 1507, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -12075,6 +12186,7 @@ "score": 100.0, "start_line": 1513, "end_line": 1513, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -12098,6 +12210,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12111,6 +12224,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -12124,6 +12238,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12137,6 +12252,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -12150,6 +12266,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12163,6 +12280,7 @@ "score": 100.0, "start_line": 1521, "end_line": 1521, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12176,6 +12294,7 @@ "score": 100.0, "start_line": 1523, "end_line": 1523, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12189,6 +12308,7 @@ "score": 100.0, "start_line": 1524, "end_line": 1539, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 136, "match_coverage": 100.0, "matcher": "2-aho", @@ -12202,6 +12322,7 @@ "score": 100.0, "start_line": 1541, "end_line": 1541, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12215,6 +12336,7 @@ "score": 100.0, "start_line": 1542, "end_line": 1557, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 136, "match_coverage": 100.0, "matcher": "2-aho", @@ -12228,6 +12350,7 @@ "score": 100.0, "start_line": 1559, "end_line": 1559, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -12241,6 +12364,7 @@ "score": 100.0, "start_line": 1560, "end_line": 1577, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 146, "match_coverage": 100.0, "matcher": "2-aho", @@ -12254,6 +12378,7 @@ "score": 100.0, "start_line": 1579, "end_line": 1579, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -12267,6 +12392,7 @@ "score": 100.0, "start_line": 1580, "end_line": 1596, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -12280,6 +12406,7 @@ "score": 100.0, "start_line": 1598, "end_line": 1598, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -12293,6 +12420,7 @@ "score": 100.0, "start_line": 1599, "end_line": 1621, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -12306,6 +12434,7 @@ "score": 100.0, "start_line": 1623, "end_line": 1623, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -12319,6 +12448,7 @@ "score": 100.0, "start_line": 1624, "end_line": 1649, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 236, "match_coverage": 100.0, "matcher": "2-aho", @@ -12332,6 +12462,7 @@ "score": 100.0, "start_line": 1651, "end_line": 1651, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12345,6 +12476,7 @@ "score": 100.0, "start_line": 1652, "end_line": 1663, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 105, "match_coverage": 100.0, "matcher": "2-aho", @@ -12358,6 +12490,7 @@ "score": 99.0, "start_line": 1665, "end_line": 1665, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12371,6 +12504,7 @@ "score": 100.0, "start_line": 1666, "end_line": 1669, + "from_file": "fusiondirectory/debian/copyright", "matched_length": 40, "match_coverage": 100.0, "matcher": "2-aho", @@ -12504,6 +12638,7 @@ "score": 100.0, "start_line": 2692, "end_line": 2692, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12524,6 +12659,7 @@ "score": 100.0, "start_line": 2804, "end_line": 2804, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12544,6 +12680,7 @@ "score": 100.0, "start_line": 2818, "end_line": 2818, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12564,6 +12701,7 @@ "score": 100.0, "start_line": 2844, "end_line": 2844, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12584,6 +12722,7 @@ "score": 100.0, "start_line": 2863, "end_line": 2863, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12604,6 +12743,7 @@ "score": 100.0, "start_line": 2873, "end_line": 2873, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12624,6 +12764,7 @@ "score": 100.0, "start_line": 2880, "end_line": 2880, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -12644,6 +12785,7 @@ "score": 100.0, "start_line": 2889, "end_line": 2889, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12664,6 +12806,7 @@ "score": 100.0, "start_line": 2903, "end_line": 2903, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12684,6 +12827,7 @@ "score": 100.0, "start_line": 2911, "end_line": 2911, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12704,6 +12848,7 @@ "score": 100.0, "start_line": 2919, "end_line": 2919, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12724,6 +12869,7 @@ "score": 100.0, "start_line": 2939, "end_line": 2939, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12744,6 +12890,7 @@ "score": 100.0, "start_line": 2945, "end_line": 2945, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12764,6 +12911,7 @@ "score": 100.0, "start_line": 2951, "end_line": 2951, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12784,6 +12932,7 @@ "score": 100.0, "start_line": 2959, "end_line": 2959, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12804,6 +12953,7 @@ "score": 100.0, "start_line": 2964, "end_line": 2964, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12824,6 +12974,7 @@ "score": 100.0, "start_line": 2970, "end_line": 2970, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12844,6 +12995,7 @@ "score": 100.0, "start_line": 2976, "end_line": 2976, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12864,6 +13016,7 @@ "score": 100.0, "start_line": 2982, "end_line": 2982, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12884,6 +13037,7 @@ "score": 100.0, "start_line": 2988, "end_line": 2988, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12904,6 +13058,7 @@ "score": 100.0, "start_line": 2993, "end_line": 2993, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12924,6 +13079,7 @@ "score": 100.0, "start_line": 2999, "end_line": 2999, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12944,6 +13100,7 @@ "score": 100.0, "start_line": 3005, "end_line": 3005, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -12963,6 +13120,7 @@ "score": 100.0, "start_line": 2925, "end_line": 2925, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12976,6 +13134,7 @@ "score": 90.0, "start_line": 3010, "end_line": 3010, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -12989,6 +13148,7 @@ "score": 100.0, "start_line": 3010, "end_line": 3010, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -13002,6 +13162,7 @@ "score": 99.0, "start_line": 3016, "end_line": 3016, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -13015,6 +13176,7 @@ "score": 100.0, "start_line": 3016, "end_line": 3016, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -13028,6 +13190,7 @@ "score": 50.0, "start_line": 3016, "end_line": 3016, + "from_file": "fusiondirectory/debian/copyright.in", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -13268,6 +13431,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fusiondirectory/debian/po/de.po", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -13401,6 +13565,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "fusiondirectory/debian/po/fr.po", "matched_length": 11, "match_coverage": 100.0, "matcher": "2-aho", 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 5d3b0b3968e..6d6869c311a 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 @@ -54,6 +54,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -146,6 +147,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -276,6 +278,7 @@ "score": 5.88, "start_line": 7, "end_line": 9, + "from_file": "google_appengine_sdk/django-1.2/MANIFEST.in", "matched_length": 5, "match_coverage": 5.88, "matcher": "3-seq", @@ -399,6 +402,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/LC_MESSAGES/djangojs.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -412,6 +416,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -449,6 +454,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -462,6 +468,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -523,6 +530,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/django.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -536,6 +544,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -573,6 +582,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/djangojs.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -586,6 +596,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -623,6 +634,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/formats.py", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -636,6 +648,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -771,6 +784,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -815,6 +829,7 @@ "score": 99.0, "start_line": 89, "end_line": 89, + "from_file": "google_appengine_sdk/django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -890,6 +905,7 @@ "score": 100.0, "start_line": 4, "end_line": 27, + "from_file": "google_appengine_sdk/django-1.3/LICENSE", "matched_length": 214, "match_coverage": 100.0, "matcher": "2-aho", @@ -925,6 +941,7 @@ "score": 5.88, "start_line": 7, "end_line": 9, + "from_file": "google_appengine_sdk/django-1.3/MANIFEST.in", "matched_length": 5, "match_coverage": 5.88, "matcher": "3-seq", @@ -1019,6 +1036,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1063,6 +1081,7 @@ "score": 99.0, "start_line": 16, "end_line": 16, + "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1184,6 +1203,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1197,6 +1217,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1258,6 +1279,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/uk/LC_MESSAGES/django.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1271,6 +1293,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1329,6 +1352,7 @@ "score": 100.0, "start_line": 4, "end_line": 27, + "from_file": "google_appengine_sdk/django-1.3/LICENSE", "matched_length": 214, "match_coverage": 100.0, "matcher": "2-aho", @@ -1431,6 +1455,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": "google_appengine_sdk/django-1.3/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1475,6 +1500,7 @@ "score": 99.0, "start_line": 89, "end_line": 89, + "from_file": "google_appengine_sdk/django-1.3/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", 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 3bd8c34bc5c..7dd320e5b71 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -67,6 +68,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -460,6 +462,7 @@ "score": 99.81, "start_line": 3, "end_line": 203, + "from_file": "paddlenlp/LICENSE", "matched_length": 1582, "match_coverage": 100.0, "matcher": "3-seq", @@ -495,6 +498,7 @@ "score": 66.67, "start_line": 305, "end_line": 307, + "from_file": "paddlenlp/README.md", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -530,6 +534,7 @@ "score": 100.0, "start_line": 221, "end_line": 221, + "from_file": "paddlenlp/README_en.md", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -543,6 +548,7 @@ "score": 99.81, "start_line": 3, "end_line": 203, + "from_file": "paddlenlp/LICENSE", "matched_length": 1582, "match_coverage": 100.0, "matcher": "3-seq", @@ -628,6 +634,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -641,6 +648,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -654,6 +662,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -691,6 +700,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/data.po", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -704,6 +714,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -717,6 +728,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -959,6 +971,7 @@ "score": 100.0, "start_line": 3, "end_line": 13, + "from_file": "paddlenlp/hubconf.py", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", @@ -1015,6 +1028,7 @@ "score": 99.81, "start_line": 3, "end_line": 203, + "from_file": "paddlenlp/LICENSE", "matched_length": 1582, "match_coverage": 100.0, "matcher": "3-seq", @@ -1035,6 +1049,7 @@ "score": 66.67, "start_line": 305, "end_line": 307, + "from_file": "paddlenlp/README.md", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1055,6 +1070,7 @@ "score": 100.0, "start_line": 221, "end_line": 221, + "from_file": "paddlenlp/README_en.md", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1068,6 +1084,7 @@ "score": 99.81, "start_line": 3, "end_line": 203, + "from_file": "paddlenlp/LICENSE", "matched_length": 1582, "match_coverage": 100.0, "matcher": "3-seq", @@ -1373,6 +1390,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -1392,6 +1410,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": "paddlenlp/setup.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -1457,6 +1476,7 @@ "score": 74.36, "start_line": 1, "end_line": 13, + "from_file": "paddlenlp/setup.py", "matched_length": 87, "match_coverage": 74.36, "matcher": "3-seq", @@ -1477,6 +1497,7 @@ "score": 95.0, "start_line": 75, "end_line": 75, + "from_file": "paddlenlp/setup.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1490,6 +1511,7 @@ "score": 100.0, "start_line": 78, "end_line": 78, + "from_file": "paddlenlp/setup.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 03f666de93c..eca6861505f 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 2, "end_line": 675, + "from_file": "physics/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -110,6 +111,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "physics/myelements/callbacks.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -123,6 +125,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "physics/myelements/callbacks.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -136,6 +139,7 @@ "score": 100.0, "start_line": 14, "end_line": 25, + "from_file": "physics/myelements/callbacks.py", "matched_length": 102, "match_coverage": 100.0, "matcher": "2-aho", @@ -169,6 +173,7 @@ "score": 100.0, "start_line": 10, "end_line": 21, + "from_file": "physics/physics.py", "matched_length": 102, "match_coverage": 100.0, "matcher": "2-aho", @@ -214,6 +219,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -227,6 +233,7 @@ "score": 100.0, "start_line": 7, "end_line": 7, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -240,6 +247,7 @@ "score": 100.0, "start_line": 11, "end_line": 11, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -253,6 +261,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -266,6 +275,7 @@ "score": 100.0, "start_line": 19, "end_line": 19, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -279,6 +289,7 @@ "score": 100.0, "start_line": 23, "end_line": 23, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -292,6 +303,7 @@ "score": 100.0, "start_line": 27, "end_line": 27, + "from_file": "physics/po/en_US.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -305,6 +317,7 @@ "score": 100.0, "start_line": 2, "end_line": 675, + "from_file": "physics/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -340,6 +353,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -353,6 +367,7 @@ "score": 100.0, "start_line": 7, "end_line": 7, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -366,6 +381,7 @@ "score": 100.0, "start_line": 11, "end_line": 11, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -379,6 +395,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -392,6 +409,7 @@ "score": 100.0, "start_line": 19, "end_line": 19, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -405,6 +423,7 @@ "score": 100.0, "start_line": 23, "end_line": 23, + "from_file": "physics/po/uk.po", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -418,6 +437,7 @@ "score": 100.0, "start_line": 2, "end_line": 675, + "from_file": "physics/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -476,6 +496,7 @@ "score": 100.0, "start_line": 2, "end_line": 675, + "from_file": "physics/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", 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 2deb5912e78..f1b2cb73739 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 @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -54,6 +55,7 @@ "score": 100.0, "start_line": 63, "end_line": 63, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -74,6 +76,7 @@ "score": 100.0, "start_line": 76, "end_line": 76, + "from_file": "samba/README.contributing", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -87,6 +90,7 @@ "score": 100.0, "start_line": 79, "end_line": 79, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -100,6 +104,7 @@ "score": 47.22, "start_line": 79, "end_line": 81, + "from_file": "samba/README.contributing", "matched_length": 17, "match_coverage": 47.22, "matcher": "3-seq", @@ -113,6 +118,7 @@ "score": 100.0, "start_line": 84, "end_line": 84, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -126,6 +132,7 @@ "score": 100.0, "start_line": 85, "end_line": 85, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -146,6 +153,7 @@ "score": 75.0, "start_line": 121, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 12, "match_coverage": 75.0, "matcher": "3-seq", @@ -159,6 +167,7 @@ "score": 100.0, "start_line": 122, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -172,6 +181,7 @@ "score": 100.0, "start_line": 123, "end_line": 123, + "from_file": "samba/README.contributing", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -192,6 +202,7 @@ "score": 81.82, "start_line": 6, "end_line": 6, + "from_file": "samba/README.md", "matched_length": 9, "match_coverage": 81.82, "matcher": "3-seq", @@ -212,6 +223,7 @@ "score": 100.0, "start_line": 22, "end_line": 24, + "from_file": "samba/README.md", "matched_length": 24, "match_coverage": 100.0, "matcher": "2-aho", @@ -319,6 +331,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -396,6 +409,7 @@ "score": 100.0, "start_line": 63, "end_line": 63, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -416,6 +430,7 @@ "score": 100.0, "start_line": 76, "end_line": 76, + "from_file": "samba/README.contributing", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -429,6 +444,7 @@ "score": 100.0, "start_line": 79, "end_line": 79, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -442,6 +458,7 @@ "score": 47.22, "start_line": 79, "end_line": 81, + "from_file": "samba/README.contributing", "matched_length": 17, "match_coverage": 47.22, "matcher": "3-seq", @@ -455,6 +472,7 @@ "score": 100.0, "start_line": 84, "end_line": 84, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -468,6 +486,7 @@ "score": 100.0, "start_line": 85, "end_line": 85, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -488,6 +507,7 @@ "score": 75.0, "start_line": 121, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 12, "match_coverage": 75.0, "matcher": "3-seq", @@ -501,6 +521,7 @@ "score": 100.0, "start_line": 122, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -514,6 +535,7 @@ "score": 100.0, "start_line": 123, "end_line": 123, + "from_file": "samba/README.contributing", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -533,6 +555,7 @@ "score": 100.0, "start_line": 38, "end_line": 38, + "from_file": "samba/README.contributing", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -546,6 +569,7 @@ "score": 100.0, "start_line": 38, "end_line": 38, + "from_file": "samba/README.contributing", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -559,6 +583,7 @@ "score": 100.0, "start_line": 39, "end_line": 39, + "from_file": "samba/README.contributing", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -572,6 +597,7 @@ "score": 20.0, "start_line": 57, "end_line": 57, + "from_file": "samba/README.contributing", "matched_length": 6, "match_coverage": 20.0, "matcher": "3-seq", @@ -585,6 +611,7 @@ "score": 50.0, "start_line": 60, "end_line": 61, + "from_file": "samba/README.contributing", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -615,6 +642,7 @@ "score": 81.82, "start_line": 6, "end_line": 6, + "from_file": "samba/README.md", "matched_length": 9, "match_coverage": 81.82, "matcher": "3-seq", @@ -635,6 +663,7 @@ "score": 100.0, "start_line": 22, "end_line": 24, + "from_file": "samba/README.md", "matched_length": 24, "match_coverage": 100.0, "matcher": "2-aho", @@ -648,6 +677,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -706,6 +736,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -726,6 +757,7 @@ "score": 100.0, "start_line": 63, "end_line": 63, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -746,6 +778,7 @@ "score": 100.0, "start_line": 76, "end_line": 76, + "from_file": "samba/README.contributing", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -759,6 +792,7 @@ "score": 100.0, "start_line": 79, "end_line": 79, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -772,6 +806,7 @@ "score": 47.22, "start_line": 79, "end_line": 81, + "from_file": "samba/README.contributing", "matched_length": 17, "match_coverage": 47.22, "matcher": "3-seq", @@ -785,6 +820,7 @@ "score": 100.0, "start_line": 84, "end_line": 84, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -798,6 +834,7 @@ "score": 100.0, "start_line": 85, "end_line": 85, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -818,6 +855,7 @@ "score": 75.0, "start_line": 121, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 12, "match_coverage": 75.0, "matcher": "3-seq", @@ -831,6 +869,7 @@ "score": 100.0, "start_line": 122, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -844,6 +883,7 @@ "score": 100.0, "start_line": 123, "end_line": 123, + "from_file": "samba/README.contributing", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -864,6 +904,7 @@ "score": 81.82, "start_line": 6, "end_line": 6, + "from_file": "samba/README.md", "matched_length": 9, "match_coverage": 81.82, "matcher": "3-seq", @@ -884,6 +925,7 @@ "score": 100.0, "start_line": 22, "end_line": 24, + "from_file": "samba/README.md", "matched_length": 24, "match_coverage": 100.0, "matcher": "2-aho", @@ -897,6 +939,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -991,6 +1034,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -1011,6 +1055,7 @@ "score": 100.0, "start_line": 63, "end_line": 63, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1031,6 +1076,7 @@ "score": 100.0, "start_line": 76, "end_line": 76, + "from_file": "samba/README.contributing", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1044,6 +1090,7 @@ "score": 100.0, "start_line": 79, "end_line": 79, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1057,6 +1104,7 @@ "score": 47.22, "start_line": 79, "end_line": 81, + "from_file": "samba/README.contributing", "matched_length": 17, "match_coverage": 47.22, "matcher": "3-seq", @@ -1070,6 +1118,7 @@ "score": 100.0, "start_line": 84, "end_line": 84, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1083,6 +1132,7 @@ "score": 100.0, "start_line": 85, "end_line": 85, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1103,6 +1153,7 @@ "score": 75.0, "start_line": 121, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 12, "match_coverage": 75.0, "matcher": "3-seq", @@ -1116,6 +1167,7 @@ "score": 100.0, "start_line": 122, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1129,6 +1181,7 @@ "score": 100.0, "start_line": 123, "end_line": 123, + "from_file": "samba/README.contributing", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1149,6 +1202,7 @@ "score": 81.82, "start_line": 6, "end_line": 6, + "from_file": "samba/README.md", "matched_length": 9, "match_coverage": 81.82, "matcher": "3-seq", @@ -1169,6 +1223,7 @@ "score": 100.0, "start_line": 22, "end_line": 24, + "from_file": "samba/README.md", "matched_length": 24, "match_coverage": 100.0, "matcher": "2-aho", @@ -1182,6 +1237,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -1283,6 +1339,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "samba/source3/locale/net/de.po", "matched_length": 10, "match_coverage": 100.0, "matcher": "2-aho", @@ -1296,6 +1353,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -1309,6 +1367,7 @@ "score": 100.0, "start_line": 63, "end_line": 63, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1322,6 +1381,7 @@ "score": 100.0, "start_line": 76, "end_line": 76, + "from_file": "samba/README.contributing", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1335,6 +1395,7 @@ "score": 100.0, "start_line": 79, "end_line": 79, + "from_file": "samba/README.contributing", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1348,6 +1409,7 @@ "score": 47.22, "start_line": 79, "end_line": 81, + "from_file": "samba/README.contributing", "matched_length": 17, "match_coverage": 47.22, "matcher": "3-seq", @@ -1361,6 +1423,7 @@ "score": 100.0, "start_line": 84, "end_line": 84, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1374,6 +1437,7 @@ "score": 100.0, "start_line": 85, "end_line": 85, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1387,6 +1451,7 @@ "score": 75.0, "start_line": 121, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 12, "match_coverage": 75.0, "matcher": "3-seq", @@ -1400,6 +1465,7 @@ "score": 100.0, "start_line": 122, "end_line": 122, + "from_file": "samba/README.contributing", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -1413,6 +1479,7 @@ "score": 100.0, "start_line": 123, "end_line": 123, + "from_file": "samba/README.contributing", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1426,6 +1493,7 @@ "score": 81.82, "start_line": 6, "end_line": 6, + "from_file": "samba/README.md", "matched_length": 9, "match_coverage": 81.82, "matcher": "3-seq", @@ -1439,6 +1507,7 @@ "score": 100.0, "start_line": 22, "end_line": 24, + "from_file": "samba/README.md", "matched_length": 24, "match_coverage": 100.0, "matcher": "2-aho", @@ -1452,6 +1521,7 @@ "score": 100.0, "start_line": 1, "end_line": 674, + "from_file": "samba/COPYING", "matched_length": 5514, "match_coverage": 100.0, "matcher": "1-hash", @@ -1489,6 +1559,7 @@ "score": 100.0, "start_line": 5, "end_line": 16, + "from_file": "samba/source3/locale/net/genmsg", "matched_length": 102, "match_coverage": 100.0, "matcher": "2-aho", 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 ffa86b00097..2380bdcc208 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 @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 a09b834be49..23c67add071 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 195255c10c4..a754f287048 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 1c4fe8aa137..2fe5d32ce08 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json index 80f1522b32e..7d01819f247 100644 --- a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json +++ b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 23, "match_coverage": 100.0, "matcher": "1-hash", 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 b5d2008511c..14afac57fbe 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 63583c2979f..49f86fee0b8 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 @@ -159,6 +159,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 2b48e0539ec..90b602f920e 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 @@ -698,6 +698,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 379a8e220a8..90bfcf34ae9 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 29c845ba07b..574d928cbf3 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 4159c3008f9..d0f98837874 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 @@ -40,6 +40,7 @@ "score": 90.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/m2/depman/foo.pom.package.json b/tests/packagedcode/data/m2/depman/foo.pom.package.json index ad563dc4c35..6166ca8d28e 100644 --- a/tests/packagedcode/data/m2/depman/foo.pom.package.json +++ b/tests/packagedcode/data/m2/depman/foo.pom.package.json @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 4e15cfd4969..a9939336afd 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 @@ -194,6 +194,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 5f98d72d7be..84a5b662cd3 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 @@ -75,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 fe2dc82680f..96e989094bc 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", 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 ae9ade643a1..3c18d31a93b 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 e912115e6d4..5eb7264aeba 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 @@ -229,6 +229,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 f53c151a492..e6277e670ac 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 @@ -32,6 +32,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 75.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", 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 374d1d08bcd..78e8a57e997 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 ad40872e6dc..5fbfc69c040 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 @@ -40,6 +40,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 19, "match_coverage": 100.0, "matcher": "2-aho", @@ -66,6 +68,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": null, "matched_length": 13, "match_coverage": 100.0, "matcher": "2-aho", 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 de9b09d8265..4d42fb2a173 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 868698c5b5d..031c56bd15c 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 7de351b8989..f59a8004edc 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 fdf1a7405f2..9b4d48ce4dd 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 16b213ba5d9..64494913298 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 7e9290aea83..a76fdcda4bd 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 @@ -537,6 +537,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 77a817d2afe..162c87811b9 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 @@ -614,6 +614,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 41c2a25283a..65693ce2aba 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 d5a4897baea..249c6c12360 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 @@ -103,6 +103,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 39797bd1573..a5bf2c1da2c 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 @@ -124,6 +124,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 d73fd486948..1ab1e6410b7 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 @@ -32,6 +32,7 @@ "score": 90.2, "start_line": 1, "end_line": 5, + "from_file": null, "matched_length": 46, "match_coverage": 90.2, "matcher": "3-seq", @@ -51,6 +52,7 @@ "score": 96.3, "start_line": 1, "end_line": 5, + "from_file": null, "matched_length": 52, "match_coverage": 100.0, "matcher": "5-undetected", 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 bd77356ebb4..b09312db0b1 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 @@ -82,6 +82,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -95,6 +96,7 @@ "score": 90.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -108,6 +110,7 @@ "score": 100.0, "start_line": 4, "end_line": 6, + "from_file": null, "matched_length": 17, "match_coverage": 100.0, "matcher": "2-aho", 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 33cb172002e..eaec56ef6dd 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 @@ -47,6 +47,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -60,6 +61,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 8837748f90f..2eb1389f962 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 @@ -236,6 +236,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 61d624df78c..7d9e093bea0 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 @@ -236,6 +236,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 2711a251c9f..6e22ab55041 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 @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -80,6 +82,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 9f58b031809..cba9f6fd228 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 61d3391043d..181ed07a4bb 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 d74ad2c3f25..20be3d0492a 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 c742d5381d2..902cf818ca7 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 @@ -75,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -88,6 +89,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 775362ade84..5c407b89b68 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 0d059c5a248..62ccaa2088a 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 129ee13b637..08eea224eaa 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 9a6a14fab0b..abf24a9d510 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 0a3c57c17be..e8d1b11bde6 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 2ac4773c045..278554ce7f9 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 @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 a6b6cb18084..cca5937fdbd 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 21376774a86..005d8b25148 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 7e899b208f7..75ca1f9adc1 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 5a3877e03c9..cbed714e171 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 5c7b54904ea..2cceeeeaf84 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 615e0de99b1..5d71429f10f 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 c28da4b4494..26734b89702 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 @@ -299,6 +299,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 516ca449dc8..04368ac6b51 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 @@ -75,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 7af33c626c7..96436e871f9 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 1db27bb67ab..40ea019f46b 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 8ddd354e6c9..184920e4442 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 40fa85cd811..97844d0fe2e 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 591b02040d9..9813f1f260d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 9892479ce99..3158446c3db 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 b0ebe03a4fc..aa589b50de2 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 @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 25808eac08a..56eccb51202 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 25808eac08a..56eccb51202 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 aeb6df7c952..a37d0780742 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 @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 065f52bfc50..31dd08ab6d5 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 7b8a75dc44e..278fddbb2c8 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 e5759035f67..009adb82369 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 @@ -166,6 +166,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 d45eefafb2e..15c604403f2 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 2ce17ac168d..973fff1db1b 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 40e4835c23c..940e6a26a64 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 47dde3c86a6..ae1064308ea 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 ab82f5eaa96..badc2aee5e1 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 b3a612b5c76..53f234cc445 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 0166c37e1c4..14767ef2801 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 80cce37d951..2a7615a0b88 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 b070f02802e..df5762e213a 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 d19948a26a9..e206a6d5e49 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 @@ -117,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -130,6 +131,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 cbc7ab3a8cd..4b759a12066 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -109,6 +110,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 4c539ed7efa..5ea1893ea2f 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 @@ -32,6 +32,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 7a41e449ea1..2184f57c4d6 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 ffed10daa2d..d8ec4d34e0b 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 04765fa7645..1deeaadad1e 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 c555da042b7..a5b4a4dedda 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 cf7d64328ad..4393fe85c5c 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 43f75297084..d9d7d95b8b7 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 efd25869c96..aaacb87ef47 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 825a7edf20a..403369abaec 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 31a75d5935f..bbd91d2ec6f 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 f5486366447..a3f40d1fccb 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 37921912109..5ec42fdbdbe 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 52b2faf6960..41b8ae4596a 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 de036dd60d2..25a7ba9e7cc 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 2eb634eb88a..bfa42521549 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 c3ad7db295c..967214543f5 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 e8b0bcc7d9d..6efd2afd000 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 cb34de53d4f..63fe5bf815d 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 c6640d89d70..c15c02f2d99 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 aad8a6970b9..78bc1ca800f 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 @@ -68,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -81,6 +82,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 13, "match_coverage": 100.0, "matcher": "2-aho", 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 3cc2909c728..15d16007396 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 d1721532651..54d8a6e109b 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 14, "match_coverage": 100.0, "matcher": "1-hash", 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 7c3af916b75..a0bd61c449a 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 3de47beee3b..10bfbe0b842 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 18afe30c9b3..c44fc490eee 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 @@ -257,6 +257,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 c6d49d4f713..bc3eef00da7 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 @@ -264,6 +264,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 f9f2b8b3da9..c76706f4a68 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 79b534eefe8..8e56aad0396 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 2ce5120d852..11af95ada2a 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 @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 c8ad9bd7445..f64ea7e58eb 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 @@ -32,6 +32,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", 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 18afe30c9b3..c44fc490eee 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 @@ -257,6 +257,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 065f52bfc50..31dd08ab6d5 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 2e64dc79dc4..2e889027e52 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 ddf02e88a9b..09e5e1cc9ec 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 @@ -40,6 +40,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -53,6 +54,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 41c2a25283a..65693ce2aba 100644 --- a/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json +++ b/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 e51f0c4ad8b..47911e414b0 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 @@ -32,6 +32,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -45,6 +46,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", 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 e8b0bcc7d9d..6efd2afd000 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 31a75d5935f..bbd91d2ec6f 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 2eb634eb88a..bfa42521549 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 @@ -40,6 +40,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 b6fc4af7ec2..19db3463d91 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -61,6 +62,7 @@ "score": 100.0, "start_line": 11, "end_line": 13, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "matched_length": 26, "match_coverage": 100.0, "matcher": "2-aho", @@ -73,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -169,6 +172,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -229,6 +233,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -248,6 +253,7 @@ "score": 100.0, "start_line": 11, "end_line": 13, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "matched_length": 26, "match_coverage": 100.0, "matcher": "2-aho", @@ -260,6 +266,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -318,6 +325,7 @@ "score": 100.0, "start_line": 11, "end_line": 13, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "matched_length": 26, "match_coverage": 100.0, "matcher": "2-aho", @@ -330,6 +338,7 @@ "score": 100.0, "start_line": 1, "end_line": 8, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "matched_length": 43, "match_coverage": 100.0, "matcher": "2-aho", @@ -350,6 +359,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 c2aff001579..576045c0316 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 @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 3, "end_line": 18, + "from_file": null, "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -313,6 +314,7 @@ "score": 64.18, "start_line": 9, "end_line": 13, + "from_file": "johnzon-jsonb-1.2.11/META-INF/DEPENDENCIES", "matched_length": 43, "match_coverage": 100.0, "matcher": "3-seq", @@ -347,6 +349,7 @@ "score": 100.0, "start_line": 2, "end_line": 4, + "from_file": "johnzon-jsonb-1.2.11/META-INF/LICENSE", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -407,6 +410,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF", "matched_length": 9, "match_coverage": 100.0, "matcher": "1-hash", @@ -451,6 +455,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF", "matched_length": 11, "match_coverage": 100.0, "matcher": "2-aho", @@ -485,6 +490,7 @@ "score": 95.0, "start_line": 5, "end_line": 6, + "from_file": "johnzon-jsonb-1.2.11/META-INF/NOTICE", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -639,6 +645,7 @@ "score": 100.0, "start_line": 3, "end_line": 18, + "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -796,6 +803,7 @@ "score": 100.0, "start_line": 3, "end_line": 18, + "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", 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 a8d0fc369d2..f19599ec741 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 @@ -49,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -352,6 +353,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -407,6 +409,7 @@ "score": 100.0, "start_line": 86, "end_line": 91, + "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "matched_length": 20, "match_coverage": 100.0, "matcher": "2-aho", 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 871ae1d28a4..6aedd0078f1 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 2, "end_line": 4, + "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -60,6 +61,7 @@ "score": 95.0, "start_line": 5, "end_line": 6, + "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -269,6 +271,7 @@ "score": 100.0, "start_line": 2, "end_line": 15, + "from_file": null, "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -336,6 +339,7 @@ "score": 100.0, "start_line": 2, "end_line": 11, + "from_file": null, "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -634,6 +638,7 @@ "score": 100.0, "start_line": 11, "end_line": 11, + "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "matched_length": 17, "match_coverage": 100.0, "matcher": "2-aho", @@ -646,6 +651,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "matched_length": 17, "match_coverage": 100.0, "matcher": "2-aho", @@ -658,6 +664,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "matched_length": 17, "match_coverage": 100.0, "matcher": "2-aho", @@ -670,6 +677,7 @@ "score": 100.0, "start_line": 19, "end_line": 19, + "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "matched_length": 17, "match_coverage": 100.0, "matcher": "2-aho", @@ -703,6 +711,7 @@ "score": 100.0, "start_line": 2, "end_line": 4, + "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -762,6 +771,7 @@ "score": 100.0, "start_line": 2, "end_line": 4, + "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", @@ -780,6 +790,7 @@ "score": 95.0, "start_line": 5, "end_line": 6, + "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -835,6 +846,7 @@ "score": 95.0, "start_line": 5, "end_line": 6, + "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -1218,6 +1230,7 @@ "score": 100.0, "start_line": 2, "end_line": 15, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -1313,6 +1326,7 @@ "score": 100.0, "start_line": 2, "end_line": 15, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -1395,6 +1409,7 @@ "score": 100.0, "start_line": 2, "end_line": 11, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -1480,6 +1495,7 @@ "score": 100.0, "start_line": 2, "end_line": 11, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/models/full-expected.json b/tests/packagedcode/data/models/full-expected.json index 075c40befa6..3a2addd15ca 100644 --- a/tests/packagedcode/data/models/full-expected.json +++ b/tests/packagedcode/data/models/full-expected.json @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/models/simple-expected.json b/tests/packagedcode/data/models/simple-expected.json index 7a009e6c1d4..16445f46dc7 100644 --- a/tests/packagedcode/data/models/simple-expected.json +++ b/tests/packagedcode/data/models/simple-expected.json @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/as_installed/package.json.expected b/tests/packagedcode/data/npm/as_installed/package.json.expected index ebc50eb3f53..c20208e3990 100644 --- a/tests/packagedcode/data/npm/as_installed/package.json.expected +++ b/tests/packagedcode/data/npm/as_installed/package.json.expected @@ -2216,6 +2216,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 051abe95065..780217f2b98 100644 --- a/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected +++ b/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -80,6 +81,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 4e2dd1b1610..812aab73f35 100644 --- a/tests/packagedcode/data/npm/authors_list_strings/package.json.expected +++ b/tests/packagedcode/data/npm/authors_list_strings/package.json.expected @@ -59,6 +59,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/casepath/package.json.expected b/tests/packagedcode/data/npm/casepath/package.json.expected index 4f7eebcf2d6..417faebd2bd 100644 --- a/tests/packagedcode/data/npm/casepath/package.json.expected +++ b/tests/packagedcode/data/npm/casepath/package.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/chartist/package.json.expected b/tests/packagedcode/data/npm/chartist/package.json.expected index 00d679a5eb6..6aa2c1f8371 100644 --- a/tests/packagedcode/data/npm/chartist/package.json.expected +++ b/tests/packagedcode/data/npm/chartist/package.json.expected @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -65,6 +66,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -84,6 +86,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -103,6 +106,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -122,6 +126,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/npm/dist/package.json.expected b/tests/packagedcode/data/npm/dist/package.json.expected index 1690a9b5ddd..64df5e99b62 100644 --- a/tests/packagedcode/data/npm/dist/package.json.expected +++ b/tests/packagedcode/data/npm/dist/package.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/double_license/package.json.expected b/tests/packagedcode/data/npm/double_license/package.json.expected index 1df155eed5b..b0639f735c4 100644 --- a/tests/packagedcode/data/npm/double_license/package.json.expected +++ b/tests/packagedcode/data/npm/double_license/package.json.expected @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -62,6 +63,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/electron/package.expected.json b/tests/packagedcode/data/npm/electron/package.expected.json index d4558217908..417c549edd8 100644 --- a/tests/packagedcode/data/npm/electron/package.expected.json +++ b/tests/packagedcode/data/npm/electron/package.expected.json @@ -44,6 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -228,6 +229,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 bfd96f47a04..90868ad1a03 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 @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -71,6 +72,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/from_npmjs/package.json.expected b/tests/packagedcode/data/npm/from_npmjs/package.json.expected index 46279ab9be0..dfd6808c21e 100644 --- a/tests/packagedcode/data/npm/from_npmjs/package.json.expected +++ b/tests/packagedcode/data/npm/from_npmjs/package.json.expected @@ -2216,6 +2216,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/from_tarball/package.json.expected b/tests/packagedcode/data/npm/from_tarball/package.json.expected index c3538d7dc69..d1a0ed4eff6 100644 --- a/tests/packagedcode/data/npm/from_tarball/package.json.expected +++ b/tests/packagedcode/data/npm/from_tarball/package.json.expected @@ -46,6 +46,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 d0799d5b244..c78c109a737 100644 --- a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json +++ b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -128,6 +129,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 6e0d334ad99..fe8e81d7f1d 100644 --- a/tests/packagedcode/data/npm/homepage-as-list/package.json.expected +++ b/tests/packagedcode/data/npm/homepage-as-list/package.json.expected @@ -56,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/invalid-dep/package.json.expected b/tests/packagedcode/data/npm/invalid-dep/package.json.expected index 989a11563bd..10aeb31b306 100644 --- a/tests/packagedcode/data/npm/invalid-dep/package.json.expected +++ b/tests/packagedcode/data/npm/invalid-dep/package.json.expected @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/keywords/package.json.expected b/tests/packagedcode/data/npm/keywords/package.json.expected index c7127cedc06..f5b7289156a 100644 --- a/tests/packagedcode/data/npm/keywords/package.json.expected +++ b/tests/packagedcode/data/npm/keywords/package.json.expected @@ -65,6 +65,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 9222af29984..bc670149801 100644 --- a/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected +++ b/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 1ad2ac3acf9..7afda78b4b5 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 @@ -51,6 +51,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 43e71ef0efd..be43e3091a6 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 @@ -78,6 +78,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 154ce619943..601b9f91c82 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 @@ -78,6 +78,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/scan-nested/scan.expected.json b/tests/packagedcode/data/npm/scan-nested/scan.expected.json index 6d7b3d798a2..dc468e55535 100644 --- a/tests/packagedcode/data/npm/scan-nested/scan.expected.json +++ b/tests/packagedcode/data/npm/scan-nested/scan.expected.json @@ -66,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -172,6 +173,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1138,6 +1140,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1805,6 +1808,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/scoped1/package.json.expected b/tests/packagedcode/data/npm/scoped1/package.json.expected index 750cef01621..53ae0704c3e 100644 --- a/tests/packagedcode/data/npm/scoped1/package.json.expected +++ b/tests/packagedcode/data/npm/scoped1/package.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/scoped2/package.json.expected b/tests/packagedcode/data/npm/scoped2/package.json.expected index 4aaee5941a9..791c86cf074 100644 --- a/tests/packagedcode/data/npm/scoped2/package.json.expected +++ b/tests/packagedcode/data/npm/scoped2/package.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/sequelize/package.json.expected b/tests/packagedcode/data/npm/sequelize/package.json.expected index c7ca933471a..47af0956b0d 100644 --- a/tests/packagedcode/data/npm/sequelize/package.json.expected +++ b/tests/packagedcode/data/npm/sequelize/package.json.expected @@ -78,6 +78,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/uri_vcs/package.json.expected b/tests/packagedcode/data/npm/uri_vcs/package.json.expected index 97fd5627e63..8de2fdb2324 100644 --- a/tests/packagedcode/data/npm/uri_vcs/package.json.expected +++ b/tests/packagedcode/data/npm/uri_vcs/package.json.expected @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -60,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/urls_dict/package.json.expected b/tests/packagedcode/data/npm/urls_dict/package.json.expected index 813da22f392..f5418b48035 100644 --- a/tests/packagedcode/data/npm/urls_dict/package.json.expected +++ b/tests/packagedcode/data/npm/urls_dict/package.json.expected @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 09d6e5e9957..bc83684f04e 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 @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -62,6 +63,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/npm/with_name/package.json.expected b/tests/packagedcode/data/npm/with_name/package.json.expected index 74c7f84123b..52e6fc67a4e 100644 --- a/tests/packagedcode/data/npm/with_name/package.json.expected +++ b/tests/packagedcode/data/npm/with_name/package.json.expected @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -52,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected index e5a92af05ac..4a94565f7de 100644 --- a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected index 94af46e24ff..d0499809286 100644 --- a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", 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 03d3d6e32c4..7df8ba1f34c 100644 --- a/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", 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 3325607a036..c2d94a9fcf4 100644 --- a/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected index 5eacec8e40c..29307252578 100644 --- a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "1-hash", 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 801c127bbcc..ffa78805483 100644 --- a/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected @@ -48,6 +48,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/opam/sample1/output.opam.expected b/tests/packagedcode/data/opam/sample1/output.opam.expected index 16bfbdafb02..cb046ddbf8e 100644 --- a/tests/packagedcode/data/opam/sample1/output.opam.expected +++ b/tests/packagedcode/data/opam/sample1/output.opam.expected @@ -118,6 +118,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/opam/sample3/output.opam.expected b/tests/packagedcode/data/opam/sample3/output.opam.expected index d03a7307d35..f0d17edf9b8 100644 --- a/tests/packagedcode/data/opam/sample3/output.opam.expected +++ b/tests/packagedcode/data/opam/sample3/output.opam.expected @@ -62,6 +62,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/opam/sample4/output.opam.expected b/tests/packagedcode/data/opam/sample4/output.opam.expected index 153ddf2f7e3..c1586a5d933 100644 --- a/tests/packagedcode/data/opam/sample4/output.opam.expected +++ b/tests/packagedcode/data/opam/sample4/output.opam.expected @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/opam/sample5/output.opam.expected b/tests/packagedcode/data/opam/sample5/output.opam.expected index 6cb4f852cfe..f4a1a0885bc 100644 --- a/tests/packagedcode/data/opam/sample5/output.opam.expected +++ b/tests/packagedcode/data/opam/sample5/output.opam.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/opam/sample6/output.opam.expected b/tests/packagedcode/data/opam/sample6/output.opam.expected index 45f5fd7b969..eafb1b07aaa 100644 --- a/tests/packagedcode/data/opam/sample6/output.opam.expected +++ b/tests/packagedcode/data/opam/sample6/output.opam.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/opam/sample7/output.opam.expected b/tests/packagedcode/data/opam/sample7/output.opam.expected index aca3125f52c..1b05e022fb8 100644 --- a/tests/packagedcode/data/opam/sample7/output.opam.expected +++ b/tests/packagedcode/data/opam/sample7/output.opam.expected @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/opam/sample8/output.opam.expected b/tests/packagedcode/data/opam/sample8/output.opam.expected index 153ddf2f7e3..c1586a5d933 100644 --- a/tests/packagedcode/data/opam/sample8/output.opam.expected +++ b/tests/packagedcode/data/opam/sample8/output.opam.expected @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected index 56e6bc879da..81b46bab60d 100644 --- a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json index bb41c2d3c78..dac350a1078 100644 --- a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json +++ b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json @@ -419,6 +419,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -547,6 +548,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -665,6 +667,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -793,6 +796,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -931,6 +935,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1036,6 +1041,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1244,6 +1250,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1356,6 +1363,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1458,6 +1466,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1566,6 +1575,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1702,6 +1712,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1834,6 +1845,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1939,6 +1951,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2337,6 +2350,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2459,6 +2473,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -2560,6 +2575,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2688,6 +2704,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2776,6 +2793,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -2911,6 +2929,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3156,6 +3175,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3281,6 +3301,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3456,6 +3477,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3561,6 +3583,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3656,6 +3679,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3751,6 +3775,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3856,6 +3881,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -3961,6 +3987,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -4066,6 +4093,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -4161,6 +4189,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -4256,6 +4285,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected index 22397ab4e0c..ef02525abd4 100644 --- a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 10, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected index 60ad14b63d4..9418f1862d1 100644 --- a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected @@ -48,6 +48,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -67,6 +68,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected index 3d4c89d7f8b..695130f1820 100644 --- a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected index 8b021a25fbe..582e9cf6fdb 100644 --- a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected index 6b9b4aff611..4d5ec9fadcc 100644 --- a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected @@ -69,6 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/about-package-expected.json b/tests/packagedcode/data/plugin/about-package-expected.json index 7a79fa22a9a..fe8f0113872 100644 --- a/tests/packagedcode/data/plugin/about-package-expected.json +++ b/tests/packagedcode/data/plugin/about-package-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -218,6 +220,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -308,6 +311,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/bower-package-expected.json b/tests/packagedcode/data/plugin/bower-package-expected.json index e52c20d8de5..a29f5a73e9a 100644 --- a/tests/packagedcode/data/plugin/bower-package-expected.json +++ b/tests/packagedcode/data/plugin/bower-package-expected.json @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -174,6 +175,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/cargo-package-expected.json b/tests/packagedcode/data/plugin/cargo-package-expected.json index ec7e4cf071f..f9ab4e6ed47 100644 --- a/tests/packagedcode/data/plugin/cargo-package-expected.json +++ b/tests/packagedcode/data/plugin/cargo-package-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -123,6 +124,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json index 37e4027f1f6..ae06fff76fb 100644 --- a/tests/packagedcode/data/plugin/chef-package-expected.json +++ b/tests/packagedcode/data/plugin/chef-package-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -154,6 +155,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -245,6 +247,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/com-package-expected.json b/tests/packagedcode/data/plugin/com-package-expected.json index 785c57ba076..43c6660822c 100644 --- a/tests/packagedcode/data/plugin/com-package-expected.json +++ b/tests/packagedcode/data/plugin/com-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/plugin/conda-package-expected.json b/tests/packagedcode/data/plugin/conda-package-expected.json index 0779d5be5bd..5700b26136a 100644 --- a/tests/packagedcode/data/plugin/conda-package-expected.json +++ b/tests/packagedcode/data/plugin/conda-package-expected.json @@ -34,6 +34,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -303,6 +304,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/cran-package-expected.json b/tests/packagedcode/data/plugin/cran-package-expected.json index 828e5cba299..b837a863ed3 100644 --- a/tests/packagedcode/data/plugin/cran-package-expected.json +++ b/tests/packagedcode/data/plugin/cran-package-expected.json @@ -49,6 +49,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -152,6 +153,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/freebsd-package-expected.json b/tests/packagedcode/data/plugin/freebsd-package-expected.json index fbb698f3e14..f0b2699c12b 100644 --- a/tests/packagedcode/data/plugin/freebsd-package-expected.json +++ b/tests/packagedcode/data/plugin/freebsd-package-expected.json @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -133,6 +134,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json index dd9ce2f9a13..adf90c2d995 100644 --- a/tests/packagedcode/data/plugin/get_installed_packages-expected.json +++ b/tests/packagedcode/data/plugin/get_installed_packages-expected.json @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -64,6 +65,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -83,6 +85,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -102,6 +105,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -217,6 +221,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, + "from_file": null, "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -236,6 +241,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, + "from_file": null, "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -255,6 +261,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, + "from_file": null, "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -274,6 +281,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, + "from_file": null, "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", @@ -451,6 +459,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -464,6 +473,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -477,6 +487,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", @@ -574,6 +585,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -587,6 +599,7 @@ "score": 100.0, "start_line": 14, "end_line": 26, + "from_file": null, "matched_length": 117, "match_coverage": 100.0, "matcher": "2-aho", @@ -600,6 +613,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": null, "matched_length": 64, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/plugin/haxe-package-expected.json b/tests/packagedcode/data/plugin/haxe-package-expected.json index 726bd08f407..c04039952a4 100644 --- a/tests/packagedcode/data/plugin/haxe-package-expected.json +++ b/tests/packagedcode/data/plugin/haxe-package-expected.json @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -133,6 +134,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json index 5c063963fa3..4c0796268b9 100644 --- a/tests/packagedcode/data/plugin/maven-package-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-expected.json @@ -226,6 +226,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -239,6 +240,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -755,6 +757,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -984,6 +987,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1156,6 +1160,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1169,6 +1174,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -1370,6 +1376,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -1383,6 +1390,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1459,6 +1467,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -1527,6 +1536,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1540,6 +1550,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -2011,6 +2022,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2087,6 +2099,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2163,6 +2176,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -6623,6 +6637,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6636,6 +6651,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -7305,6 +7321,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -7875,6 +7892,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -8369,6 +8387,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -8382,6 +8401,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -8815,6 +8835,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -8828,6 +8849,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -8978,6 +9000,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -9140,6 +9163,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -9153,6 +9177,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -10431,6 +10456,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -11191,6 +11217,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -11461,6 +11488,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 5c063963fa3..4c0796268b9 100644 --- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json @@ -226,6 +226,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -239,6 +240,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -755,6 +757,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -984,6 +987,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1156,6 +1160,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1169,6 +1174,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -1370,6 +1376,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -1383,6 +1390,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1459,6 +1467,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -1527,6 +1536,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1540,6 +1550,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -2011,6 +2022,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2087,6 +2099,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2163,6 +2176,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -6623,6 +6637,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -6636,6 +6651,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -7305,6 +7321,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -7875,6 +7892,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -8369,6 +8387,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -8382,6 +8401,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -8815,6 +8835,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -8828,6 +8849,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -8978,6 +9000,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -9140,6 +9163,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -9153,6 +9177,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -10431,6 +10456,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -11191,6 +11217,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -11461,6 +11488,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/mui-package-expected.json b/tests/packagedcode/data/plugin/mui-package-expected.json index 83ae8b8f69d..0f6aa2ed065 100644 --- a/tests/packagedcode/data/plugin/mui-package-expected.json +++ b/tests/packagedcode/data/plugin/mui-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/plugin/mun-package-expected.json b/tests/packagedcode/data/plugin/mun-package-expected.json index 0602ecff548..2cfa9b5fed7 100644 --- a/tests/packagedcode/data/plugin/mun-package-expected.json +++ b/tests/packagedcode/data/plugin/mun-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/plugin/nuget-package-expected.json b/tests/packagedcode/data/plugin/nuget-package-expected.json index 764b31e348b..14cbe8746da 100644 --- a/tests/packagedcode/data/plugin/nuget-package-expected.json +++ b/tests/packagedcode/data/plugin/nuget-package-expected.json @@ -49,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-hash", @@ -308,6 +309,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json index 6ec96e0d104..9052da56499 100644 --- a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json +++ b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json @@ -49,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -180,6 +181,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/python-package-expected.json b/tests/packagedcode/data/plugin/python-package-expected.json index eb08a790467..01ee424423e 100644 --- a/tests/packagedcode/data/plugin/python-package-expected.json +++ b/tests/packagedcode/data/plugin/python-package-expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -124,6 +125,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -143,6 +145,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -209,6 +212,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -289,6 +293,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -308,6 +313,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -382,6 +388,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -804,6 +811,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -823,6 +831,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -895,6 +904,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -982,6 +992,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -1069,6 +1080,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -1385,6 +1397,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1404,6 +1417,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/rpm-package-expected.json b/tests/packagedcode/data/plugin/rpm-package-expected.json index 5c8ed5fbbbd..7fc3567b857 100644 --- a/tests/packagedcode/data/plugin/rpm-package-expected.json +++ b/tests/packagedcode/data/plugin/rpm-package-expected.json @@ -34,6 +34,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -109,6 +110,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/rubygems-package-expected.json b/tests/packagedcode/data/plugin/rubygems-package-expected.json index ee47c0b3f04..9559ef1c5a1 100644 --- a/tests/packagedcode/data/plugin/rubygems-package-expected.json +++ b/tests/packagedcode/data/plugin/rubygems-package-expected.json @@ -63,6 +63,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -348,6 +349,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/sys-package-expected.json b/tests/packagedcode/data/plugin/sys-package-expected.json index e851355c054..1a59b49e085 100644 --- a/tests/packagedcode/data/plugin/sys-package-expected.json +++ b/tests/packagedcode/data/plugin/sys-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/plugin/tlb-package-expected.json b/tests/packagedcode/data/plugin/tlb-package-expected.json index 544ee1e1dcd..49e8281696e 100644 --- a/tests/packagedcode/data/plugin/tlb-package-expected.json +++ b/tests/packagedcode/data/plugin/tlb-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/packagedcode/data/plugin/win_pe-package-expected.json b/tests/packagedcode/data/plugin/win_pe-package-expected.json index 3801abea231..92edc14fac6 100644 --- a/tests/packagedcode/data/plugin/win_pe-package-expected.json +++ b/tests/packagedcode/data/plugin/win_pe-package-expected.json @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 217, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/plugin/winmd-package-expected.json b/tests/packagedcode/data/plugin/winmd-package-expected.json index c87bc88f96a..6b5ff8a5c1b 100644 --- a/tests/packagedcode/data/plugin/winmd-package-expected.json +++ b/tests/packagedcode/data/plugin/winmd-package-expected.json @@ -48,6 +48,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 6538e4c96d1..998ac6ad772 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 @@ -49,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -68,6 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 a3c3690ce81..4318b449f44 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 08a6b8e1424..9b29f7f7b55 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 4e11cf188f6..0c4d1027a3e 100644 --- a/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json +++ b/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json @@ -47,6 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -66,6 +67,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json index 3256e0215dd..76e560d3bae 100644 --- a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 24816226e34..9aa72228955 100644 --- a/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "5-undetected", 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 3256e0215dd..76e560d3bae 100644 --- a/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 1dd108c21c2..23533c500c0 100644 --- a/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json @@ -62,6 +62,7 @@ "score": 90.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -81,6 +82,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", 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 80c2791470c..224f1c79e20 100644 --- a/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json @@ -62,6 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -81,6 +82,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 4ad8e7d9f76..cc015804add 100644 --- a/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json @@ -55,6 +55,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 bb4563727a6..64889288782 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 @@ -65,6 +65,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -84,6 +85,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 742bb22528f..c08cc1a19c3 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -72,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 e0bff94b2a3..b2d012e7358 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 @@ -47,6 +47,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 21764ea19fd..83350a1069e 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -69,6 +70,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 7b41032d6c5..9e4627ecdf6 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 6e5c7c4c2b9..7f0a8bd3fd8 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 6c8fa6f0801..517a6026ef2 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 6c8fa6f0801..517a6026ef2 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 a71a9411f8c..c107360a2d7 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 9d4fcf8096c..728873c6349 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 @@ -53,6 +53,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -72,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-hash", 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 87c0f38d682..8afd451d77f 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 @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -73,6 +74,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 7a969a2bc5d..915b52f0bd0 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 @@ -66,6 +66,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -85,6 +86,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-hash", 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 0d5d0787ea8..12bfff2f7b9 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 @@ -91,6 +91,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 11, "match_coverage": 100.0, "matcher": "1-hash", @@ -110,6 +111,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -123,6 +125,7 @@ "score": 99.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -136,6 +139,7 @@ "score": 99.0, "start_line": 3, "end_line": 3, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -149,6 +153,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", 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 d9b031a2cd2..399250756fe 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 @@ -60,6 +60,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -79,6 +80,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 c9d048aae9f..5d4cf982d2c 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 @@ -58,6 +58,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -71,6 +72,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -90,6 +92,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 d97d3d83b19..1e267ec18f4 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 @@ -61,6 +61,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -80,6 +81,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 6b25152558a..174c41f0c0f 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 @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -73,6 +74,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 92c8ba07171..f21aa6767b7 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 @@ -56,6 +56,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -75,6 +76,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 aa1a21e5f80..feac6f20098 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 @@ -62,6 +62,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -81,6 +82,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 78de53878db..05a28585273 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 @@ -49,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -68,6 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 c8402beb798..24949605465 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 @@ -47,6 +47,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 ce87ec7e0b1..df372e279cf 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 @@ -41,6 +41,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", 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 9c774d3f344..c11e07d0176 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 e0e95fd4b52..a86d620f281 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 @@ -66,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -85,6 +86,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f8be2cb41f4..1d1184e91f6 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 @@ -51,6 +51,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -70,6 +71,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 10, "match_coverage": 100.0, "matcher": "1-hash", 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 c165f6ee7ab..6110c67f817 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 @@ -56,6 +56,7 @@ "score": 90.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -75,6 +76,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 a69a66ebd88..41b600b674a 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 8d85bd5e958..6c904a5e922 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 @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -74,6 +75,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 2dab7004000..f618a11fc2c 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 @@ -53,6 +53,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 de6f3e5d44f..4db38d22aff 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 @@ -41,6 +41,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", 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 032f0f85c89..49bc753490e 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 @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -71,6 +72,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 ad33aa17151..9a255237f3a 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", 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 e9ac569d2bc..0c3af83c018 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 @@ -52,6 +52,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -71,6 +72,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 6064b78e254..d281c26fb27 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 @@ -62,6 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -81,6 +82,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 81583c98610..bedd36f41ac 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -72,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -85,6 +87,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 6441c0ab2e6..ddf77d8c525 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 @@ -56,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -75,6 +76,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 9c56bc3e228..26b991979fa 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 @@ -51,6 +51,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -70,6 +71,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 5e75fcc6009..a043a6a6208 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 04306643184..6bb2d589f9c 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -72,6 +73,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 bb005e5c132..10272a4ef44 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 @@ -53,6 +53,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -72,6 +73,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 b566194eb4e..18574e14d94 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 @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -65,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 acf12b3309c..1a82a26fe59 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 @@ -51,6 +51,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -70,6 +71,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 1af25fdbc16..64f4bafff88 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 @@ -56,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -75,6 +76,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 dee40d6b704..e72784bd5f9 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 @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 1d90d220624..8d81d80062c 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 @@ -52,6 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -65,6 +66,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -84,6 +86,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -103,6 +106,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 fd0179301c4..1cbd1d8d648 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 @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -65,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 8da370b964c..7e800dcb1e9 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 @@ -62,6 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -81,6 +82,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 7082f6dec6e..1837f32201b 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -80,6 +81,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 d18d3c60ca7..8324462aea3 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 @@ -57,6 +57,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 6c7964a3afe..7486ebafa8e 100644 --- a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json +++ b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -131,6 +132,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -150,6 +152,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -269,6 +272,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -414,6 +418,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -433,6 +438,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1001,6 +1007,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json index 7a6de53c929..bccbf9e28ae 100644 --- a/tests/packagedcode/data/pypi/solo-metadata/expected.json +++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json @@ -69,6 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -177,6 +178,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 18, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/pypi/solo-setup/expected.json b/tests/packagedcode/data/pypi/solo-setup/expected.json index 738db8e3d7d..f02aedca79a 100644 --- a/tests/packagedcode/data/pypi/solo-setup/expected.json +++ b/tests/packagedcode/data/pypi/solo-setup/expected.json @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -74,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 4568299eeed..bf8302a84f5 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 @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -74,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -207,6 +209,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -226,6 +229,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -663,6 +667,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -682,6 +687,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -800,6 +806,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -819,6 +826,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 6c36cefee06..15786349a8c 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 @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -80,6 +81,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f2cf455c43d..018b90bb369 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 @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -74,6 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -180,6 +182,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -283,6 +286,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -302,6 +306,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -347,6 +352,7 @@ "score": 100.0, "start_line": 8, "end_line": 8, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -365,6 +371,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -383,6 +390,7 @@ "score": 100.0, "start_line": 27, "end_line": 27, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -395,6 +403,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -704,6 +713,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -780,6 +790,7 @@ "score": 100.0, "start_line": 87, "end_line": 87, + "from_file": "pip-22.0.4/setup.cfg", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -792,6 +803,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -804,6 +816,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -848,6 +861,7 @@ "score": 100.0, "start_line": 87, "end_line": 87, + "from_file": "pip-22.0.4/setup.cfg", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -860,6 +874,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -872,6 +887,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -950,6 +966,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/setup.py", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -969,6 +986,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1015,6 +1033,7 @@ "score": 100.0, "start_line": 31, "end_line": 31, + "from_file": "pip-22.0.4/setup.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1027,6 +1046,7 @@ "score": 100.0, "start_line": 35, "end_line": 35, + "from_file": "pip-22.0.4/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1138,6 +1158,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1157,6 +1178,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1356,6 +1378,7 @@ "score": 100.0, "start_line": 8, "end_line": 8, + "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1374,6 +1397,7 @@ "score": 100.0, "start_line": 15, "end_line": 15, + "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1392,6 +1416,7 @@ "score": 100.0, "start_line": 27, "end_line": 27, + "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1404,6 +1429,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 b8dc46a985a..02d34587a11 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 @@ -44,6 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 b0c5f9b8540..0f6a491972c 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 @@ -44,6 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 3256e0215dd..76e560d3bae 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 bf927b1f015..e74d75ecca8 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -72,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 82b2dc073d1..48724624980 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 81f9d1277f3..e789b8eb58d 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 2e1b06c479d..980149239ec 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 @@ -58,6 +58,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -77,6 +78,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -774,6 +776,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -793,6 +796,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -900,6 +904,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -919,6 +924,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 52a474b1b75..3a1cd96816a 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 @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -65,6 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -239,6 +241,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -258,6 +261,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 b4f80968066..ac728b66491 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 @@ -58,6 +58,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -77,6 +78,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 b23bf5d33da..9fd32d8d201 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 35a8506361b..3d23f4fe1bf 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 @@ -58,6 +58,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -77,6 +78,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 057e566e209..651e1e90755 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 @@ -59,6 +59,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -78,6 +79,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 05ef6fe1daf..db080ef08c3 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 @@ -50,6 +50,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -69,6 +70,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", 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 ea8806503b8..7e72476fbb0 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 @@ -56,6 +56,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -75,6 +76,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 8e21b2894cb..cd9ae6b1bce 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 @@ -53,6 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 6581c1140ff..f17b60346c3 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -67,6 +68,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/readme/android/basic/README.android.expected b/tests/packagedcode/data/readme/android/basic/README.android.expected index 2a94e5e4683..343ea50d21f 100644 --- a/tests/packagedcode/data/readme/android/basic/README.android.expected +++ b/tests/packagedcode/data/readme/android/basic/README.android.expected @@ -33,6 +33,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected index b41b77a0056..ee6eb163282 100644 --- a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected +++ b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected @@ -33,6 +33,7 @@ "score": 90.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected index 48bf7f71e31..3ae9852bd21 100644 --- a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "5-undetected", 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 48bf7f71e31..3ae9852bd21 100644 --- a/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected +++ b/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "5-undetected", 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 1333b8fc79f..bc31a71642e 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 1333b8fc79f..bc31a71642e 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 2dd73966b3f..626cc15a99d 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 2dd73966b3f..626cc15a99d 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 2dd73966b3f..626cc15a99d 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 48bf7f71e31..3ae9852bd21 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 4, "match_coverage": 100.0, "matcher": "5-undetected", 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 2dd73966b3f..626cc15a99d 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 @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/readme/google/basic/README.google.expected b/tests/packagedcode/data/readme/google/basic/README.google.expected index da949361882..1c9f5c75614 100644 --- a/tests/packagedcode/data/readme/google/basic/README.google.expected +++ b/tests/packagedcode/data/readme/google/basic/README.google.expected @@ -33,6 +33,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected index 20618c64b81..d8c7b71ab24 100644 --- a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected +++ b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected @@ -33,6 +33,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 8765c418005..9553422794b 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", 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 8277f1fb74a..15b96261fac 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 @@ -35,6 +35,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -136,6 +137,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -228,6 +230,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", 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 b93d61a1023..50c15ac9e96 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 @@ -35,6 +35,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -48,6 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -61,6 +63,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -74,6 +77,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -238,6 +242,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 f5aa4d488bc..d7c26def90f 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 @@ -35,6 +35,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -964,6 +965,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 7e37e78e495..1930911cda4 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 @@ -35,6 +35,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -118,6 +119,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 b5b871cd919..c6d52e1e7b5 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 @@ -35,6 +35,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -433,6 +434,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -497,6 +499,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 e27c95c81c5..82b3263a4d7 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 @@ -36,6 +36,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -305,6 +306,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -412,6 +414,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -480,6 +483,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -17201,6 +17205,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17214,6 +17219,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17227,6 +17233,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17295,6 +17302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17308,6 +17316,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17321,6 +17330,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17806,6 +17816,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -18822,6 +18833,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -18938,6 +18950,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -19045,6 +19058,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19113,6 +19127,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -19409,6 +19424,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19489,6 +19505,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -19623,6 +19640,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19703,6 +19721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -20089,6 +20108,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -20102,6 +20122,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -20209,6 +20230,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21072,6 +21094,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21085,6 +21108,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21201,6 +21225,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21214,6 +21239,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21357,6 +21383,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21446,6 +21473,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21949,6 +21977,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22047,6 +22076,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22127,6 +22157,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22279,6 +22310,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22292,6 +22324,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22435,6 +22468,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22524,6 +22558,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22622,6 +22657,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22729,6 +22765,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -22797,6 +22834,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22904,6 +22942,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -23002,6 +23041,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -23015,6 +23055,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -23095,6 +23136,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -23175,6 +23217,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -23678,6 +23721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24244,6 +24288,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24257,6 +24302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24400,6 +24446,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24413,6 +24460,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24673,6 +24721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24686,6 +24735,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24699,6 +24749,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24842,6 +24893,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -24967,6 +25019,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -25101,6 +25154,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -25397,6 +25451,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -25477,6 +25532,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -25593,6 +25649,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28544,6 +28601,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -28660,6 +28718,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28673,6 +28732,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28762,6 +28822,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -28887,6 +28948,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -29102,6 +29164,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", @@ -29263,6 +29326,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -29343,6 +29407,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -29423,6 +29488,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30277,6 +30343,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30290,6 +30357,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30303,6 +30371,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30316,6 +30385,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30396,6 +30466,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30548,6 +30619,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30655,6 +30727,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30814,6 +30887,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "5-undetected", @@ -30882,6 +30956,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30895,6 +30970,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30908,6 +30984,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30921,6 +30998,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -31010,6 +31088,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -31180,6 +31259,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185025,6 +185105,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185093,6 +185174,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -185182,6 +185264,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185195,6 +185278,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185208,6 +185292,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185324,6 +185409,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -185575,6 +185661,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -185643,6 +185730,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185723,6 +185811,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -185839,6 +185928,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185907,6 +185997,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185996,6 +186087,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186094,6 +186186,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186107,6 +186200,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186120,6 +186214,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186227,6 +186322,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -186307,6 +186403,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -186405,6 +186502,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -186566,6 +186664,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187141,6 +187240,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187154,6 +187254,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187167,6 +187268,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187301,6 +187403,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187381,6 +187484,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187461,6 +187565,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187622,6 +187727,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -187702,6 +187808,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -188799,6 +188906,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -188915,6 +189023,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189067,6 +189176,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189183,6 +189293,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189281,6 +189392,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189294,6 +189406,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189419,6 +189532,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189562,6 +189676,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189678,6 +189793,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189767,6 +189883,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -190522,6 +190639,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -190764,6 +190882,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193454,6 +193573,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -193534,6 +193654,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193547,6 +193668,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193690,6 +193812,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193896,6 +194019,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -193964,6 +194088,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", @@ -194032,6 +194157,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -194121,6 +194247,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194201,6 +194328,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194281,6 +194409,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194361,6 +194490,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194459,6 +194589,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -194584,6 +194715,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -194709,6 +194841,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -194722,6 +194855,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -194735,6 +194869,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195157,6 +195292,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -195444,6 +195580,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -195524,6 +195661,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -195694,6 +195832,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195707,6 +195846,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195823,6 +195963,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -195912,6 +196053,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -196919,6 +197061,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -197008,6 +197151,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -197097,6 +197241,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197110,6 +197255,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197123,6 +197269,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197136,6 +197283,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -216667,6 +216815,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -217029,6 +217178,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -217382,6 +217532,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -217446,6 +217597,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -234179,6 +234331,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -234192,6 +234345,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -234205,6 +234359,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -234269,6 +234424,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -234282,6 +234438,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -234295,6 +234452,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -237240,6 +237398,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -238448,6 +238607,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -238603,6 +238763,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -238731,6 +238892,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -238841,6 +239003,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -239176,6 +239339,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -239277,6 +239441,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -239477,6 +239642,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -239587,6 +239753,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -240003,6 +240170,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -240016,6 +240184,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -240171,6 +240340,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -241163,6 +241333,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -241176,6 +241347,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -241322,6 +241494,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -241335,6 +241508,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -241508,6 +241682,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -241591,6 +241766,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -242115,6 +242291,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -242216,6 +242393,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -242326,6 +242504,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -242517,6 +242696,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -242530,6 +242710,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -242703,6 +242884,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -242804,6 +242986,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -242905,6 +243088,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -243042,6 +243226,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -243152,6 +243337,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -243388,6 +243574,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -243507,6 +243694,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -243520,6 +243708,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -243783,6 +243972,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -243893,6 +244083,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -244480,6 +244671,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245112,6 +245304,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245125,6 +245318,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245298,6 +245492,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245311,6 +245506,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245610,6 +245806,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245623,6 +245820,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245636,6 +245834,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -245827,6 +246026,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -246000,6 +246200,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -246245,6 +246446,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -246607,6 +246809,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -246717,6 +246920,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -246881,6 +247085,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -250078,6 +250283,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -250215,6 +250421,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -250228,6 +250435,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -250338,6 +250546,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -250475,6 +250684,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -250909,6 +251119,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", @@ -251163,6 +251374,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -251264,6 +251476,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -251338,6 +251551,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -253653,6 +253867,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -253666,6 +253881,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -253679,6 +253895,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -253692,6 +253909,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -253802,6 +254020,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -253984,6 +254203,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -254121,6 +254341,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -254391,6 +254612,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "5-undetected", @@ -254455,6 +254677,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -254468,6 +254691,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -254481,6 +254705,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -254494,6 +254719,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -254631,6 +254857,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -254876,6 +255103,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -410209,6 +410437,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -410310,6 +410539,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -411851,6 +412081,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -411864,6 +412095,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -411877,6 +412109,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -412311,6 +412544,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -412556,6 +412790,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -412648,6 +412883,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -412767,6 +413003,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -412922,6 +413159,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -413014,6 +413252,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -413106,6 +413345,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -413234,6 +413474,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -413247,6 +413488,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -413260,6 +413502,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -413361,6 +413604,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -413462,6 +413706,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -413581,6 +413826,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -413826,6 +414072,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -414449,6 +414696,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -414462,6 +414710,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -414475,6 +414724,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -414666,6 +414916,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -414758,6 +415009,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -415795,6 +416047,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -416328,6 +416581,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -416402,6 +416656,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -417691,6 +417946,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -417846,6 +418102,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -418028,6 +418285,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -418165,6 +418423,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -418266,6 +418525,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -418279,6 +418539,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -418434,6 +418695,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -418886,6 +419148,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -419023,6 +419286,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -419169,6 +419433,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -419981,6 +420246,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -420379,6 +420645,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -423873,6 +424140,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -423974,6 +424242,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -423987,6 +424256,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -424214,6 +424484,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -424549,6 +424820,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -424713,6 +424985,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", @@ -424805,6 +425078,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -424906,6 +425180,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -425016,6 +425291,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -425126,6 +425402,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -425272,6 +425549,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -425409,6 +425687,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -425555,6 +425834,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -425701,6 +425981,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -425714,6 +425995,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -425727,6 +426009,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -426575,6 +426858,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -426937,6 +427221,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -427038,6 +427323,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -427229,6 +427515,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -427242,6 +427529,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -427352,6 +427640,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -427471,6 +427760,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -428706,6 +428996,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -428816,6 +429107,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -428926,6 +429218,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -428939,6 +429232,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -428952,6 +429246,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -428965,6 +429260,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 53cb0af2c06..229badcb022 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 @@ -35,6 +35,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -352,6 +353,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 53cb0af2c06..229badcb022 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 @@ -35,6 +35,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -352,6 +353,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 f6bd91e3c5e..946d9bb396d 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 @@ -48,6 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 67d6276432c..11dd68fd300 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 @@ -62,6 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 223f656dc75..72a89125f6e 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 @@ -41,6 +41,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", 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 8249a3420b4..e9e5d882186 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 @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 29c7b226981..78e919217fb 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 @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 38c10bae04e..e4b6bc15ee0 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 @@ -43,6 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 4976b06288b..3c7a5932a66 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 @@ -55,6 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 a7bb31b5045..a217358bdfc 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 @@ -41,6 +41,7 @@ "score": 75.0, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", 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 3f8dce39874..edcf14a0ab5 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 @@ -41,6 +41,7 @@ "score": 75.0, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", 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 34b6fd1ed85..5aafed76894 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 @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 ccb14a0a74e..1b98d8a7ccf 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 @@ -33,6 +33,7 @@ "score": 75.0, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", 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 fc58940f8b3..a8247252310 100644 --- a/tests/packagedcode/data/win_pe/chcp.com.package-expected.json +++ b/tests/packagedcode/data/win_pe/chcp.com.package-expected.json @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 22eca18d571..f01953a94eb 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 @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 55ddfcff862..ff81afeb963 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 @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 ccb14a0a74e..1b98d8a7ccf 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 @@ -33,6 +33,7 @@ "score": 75.0, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", 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 3b4b626b8f4..e9275302b7d 100644 --- a/tests/packagedcode/data/win_pe/file.exe.package-expected.json +++ b/tests/packagedcode/data/win_pe/file.exe.package-expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 217, "match_coverage": 100.0, "matcher": "2-aho", 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 019c23c5ed9..dfac96b9428 100644 --- a/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 30, "match_coverage": 100.0, "matcher": "1-hash", 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 86a817c8ab9..806080dee59 100644 --- a/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 29, "match_coverage": 100.0, "matcher": "1-hash", 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 90c7e2696d4..47318de3c72 100644 --- a/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json +++ b/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 141004ae02e..1e8f3b94512 100644 --- a/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json +++ b/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json @@ -41,6 +41,7 @@ "score": 88.89, "start_line": 1, "end_line": 3, + "from_file": null, "matched_length": 8, "match_coverage": 100.0, "matcher": "5-undetected", 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 663bc995ef7..5c2b40b3819 100644 --- a/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json @@ -41,6 +41,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 29, "match_coverage": 100.0, "matcher": "1-hash", 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 8f2569b9b2e..3d35c7f8685 100644 --- a/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json @@ -41,6 +41,7 @@ "score": 66.67, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -60,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json index 67da4977e33..f60cd5c7483 100644 --- a/tests/scancode/data/composer/composer.expected.json +++ b/tests/scancode/data/composer/composer.expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -236,6 +237,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json index 0008cfa0fb6..69f67a5ce23 100644 --- a/tests/scancode/data/info/all.expected.json +++ b/tests/scancode/data/info/all.expected.json @@ -306,6 +306,7 @@ "score": 100.0, "start_line": 25, "end_line": 51, + "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "matched_length": 243, "match_coverage": 100.0, "matcher": "2-aho", @@ -409,6 +410,7 @@ "score": 100.0, "start_line": 5, "end_line": 12, + "from_file": "basic.tgz/basic/main.c", "matched_length": 50, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json index e5827563033..b97e432554f 100644 --- a/tests/scancode/data/info/all.rooted.expected.json +++ b/tests/scancode/data/info/all.rooted.expected.json @@ -160,6 +160,7 @@ "score": 100.0, "start_line": 25, "end_line": 51, + "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "matched_length": 243, "match_coverage": 100.0, "matcher": "2-aho", @@ -245,6 +246,7 @@ "score": 100.0, "start_line": 5, "end_line": 12, + "from_file": "basic.tgz/basic/main.c", "matched_length": 50, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected index 2483a3ad539..09da8575aba 100644 --- a/tests/scancode/data/license_text/test.expected +++ b/tests/scancode/data/license_text/test.expected @@ -21,6 +21,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "test.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json index 85675322dde..f638c47b359 100644 --- a/tests/scancode/data/plugin_only_findings/basic.expected.json +++ b/tests/scancode/data/plugin_only_findings/basic.expected.json @@ -45,6 +45,7 @@ "score": 100.0, "start_line": 25, "end_line": 51, + "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "matched_length": 243, "match_coverage": 100.0, "matcher": "2-aho", @@ -116,6 +117,7 @@ "score": 100.0, "start_line": 5, "end_line": 12, + "from_file": "basic.tgz/basic/main.c", "matched_length": 50, "match_coverage": 100.0, "matcher": "2-aho", 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 5c336ed8cea..8ebe3ce5964 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 @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", @@ -125,6 +126,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json index b627df979b7..9bfba3ea73a 100644 --- a/tests/summarycode/data/classify/with_package_data.expected.json +++ b/tests/summarycode/data/classify/with_package_data.expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -47,6 +48,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -653,6 +655,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -666,6 +669,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 ce7e7d4ae27..9a845eadfad 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json @@ -80,6 +80,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -407,6 +408,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/component/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -475,6 +477,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/component/src2", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -543,6 +546,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/component/src3", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -611,6 +615,7 @@ "score": 80.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/component/src4", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -739,6 +744,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "component-package-build/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -781,6 +787,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "component-package-build/package/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -849,6 +856,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/package/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -917,6 +925,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package-build/package/src2", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json index 25db40bc631..0b7e5b7f2b0 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -246,6 +247,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/component/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -314,6 +316,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/component/src2", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -382,6 +385,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/component/src3", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -450,6 +454,7 @@ "score": 80.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/component/src4", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -578,6 +583,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "component-package/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -620,6 +626,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "component-package/package/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -688,6 +695,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/package/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -756,6 +764,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "component-package/package/src2", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 1ca20154a36..66076f09986 100644 --- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json +++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json @@ -203,6 +203,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/clear-majority/dir1/file1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -215,6 +216,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/clear-majority/dir1/file1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -355,6 +357,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/no-majority/bar/qux", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -367,6 +370,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/no-majority/bar/qux", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -472,6 +476,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/no-majority/foo/baz", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -484,6 +489,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "license-holder-rollup/no-majority/foo/baz", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", 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 d837c37e06f..7dd51ccbddb 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 @@ -96,6 +96,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "multiple-same-holder-and-license/bar", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -108,6 +109,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "multiple-same-holder-and-license/bar", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -186,6 +188,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "multiple-same-holder-and-license/foo", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -198,6 +201,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "multiple-same-holder-and-license/foo", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 cbd656db35d..0e193aaa413 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 @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -226,6 +227,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "package-files-not-counted-in-license-holders/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -268,6 +270,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "package-files-not-counted-in-license-holders/package/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -338,6 +341,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package-files-not-counted-in-license-holders/package/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -408,6 +412,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package-files-not-counted-in-license-holders/package/src2", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -478,6 +483,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package-files-not-counted-in-license-holders/package/src3", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -546,6 +552,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package-files-not-counted-in-license-holders/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -614,6 +621,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package-files-not-counted-in-license-holders/src2", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json index e5bc7e28a0b..b75f8ef82b3 100644 --- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -191,6 +192,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -233,6 +235,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "package/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -289,6 +292,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package/src1", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -359,6 +363,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package/src2", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -429,6 +434,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "package/src3", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json index 9b62719fba1..e987835c4b8 100644 --- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json @@ -34,6 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -172,6 +173,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "package-manifest/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -214,6 +216,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "package-manifest/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 fac3bf62469..7db28dc972f 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 @@ -112,6 +112,7 @@ "score": 100.0, "start_line": 3, "end_line": 7, + "from_file": "report-subdirectory-with-minority-origin/b", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -180,6 +181,7 @@ "score": 100.0, "start_line": 3, "end_line": 7, + "from_file": "report-subdirectory-with-minority-origin/c", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -248,6 +250,7 @@ "score": 100.0, "start_line": 3, "end_line": 7, + "from_file": "report-subdirectory-with-minority-origin/d", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -353,6 +356,7 @@ "score": 100.0, "start_line": 3, "end_line": 7, + "from_file": "report-subdirectory-with-minority-origin/minority_holder/a", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", 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 114413820d1..a0df1f9a789 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 @@ -152,6 +152,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/bar", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -164,6 +165,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/bar", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -232,6 +234,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/bax", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -244,6 +247,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/bax", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -349,6 +353,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/local-majority/baz", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -361,6 +366,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/local-majority/baz", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -429,6 +435,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/qux", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -441,6 +448,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "return-nested-local-majority/foo/qux", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json index 3a096e044bb..d86d7a044d5 100644 --- a/tests/summarycode/data/score/basic-expected.json +++ b/tests/summarycode/data/score/basic-expected.json @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -366,6 +367,7 @@ "score": 100.0, "start_line": 20, "end_line": 37, + "from_file": "basic/README.md", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -438,6 +440,7 @@ "score": 100.0, "start_line": 2, "end_line": 19, + "from_file": "basic/index.js", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -534,6 +537,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "basic/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -712,6 +716,7 @@ "score": 100.0, "start_line": 7, "end_line": 7, + "from_file": "basic/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json index 5c4a52da39e..23f2a0ed115 100644 --- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json +++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -371,6 +372,7 @@ "score": 100.0, "start_line": 20, "end_line": 37, + "from_file": "inconsistent_licenses_copyleft/README.md", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -443,6 +445,7 @@ "score": 100.0, "start_line": 2, "end_line": 19, + "from_file": "inconsistent_licenses_copyleft/index.js", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -539,6 +542,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "inconsistent_licenses_copyleft/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -717,6 +721,7 @@ "score": 100.0, "start_line": 7, "end_line": 7, + "from_file": "inconsistent_licenses_copyleft/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -783,6 +788,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "inconsistent_licenses_copyleft/util.js", "matched_length": 8, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json index 3407c091ef2..f8e0119d8f5 100644 --- a/tests/summarycode/data/score/jar-expected.json +++ b/tests/summarycode/data/score/jar-expected.json @@ -46,6 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -59,6 +60,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": null, "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -406,6 +408,7 @@ "score": 100.0, "start_line": 2, "end_line": 202, + "from_file": "jar/META-INF/LICENSE.txt", "matched_length": 1584, "match_coverage": 100.0, "matcher": "1-hash", @@ -487,6 +490,7 @@ "score": 100.0, "start_line": 2, "end_line": 202, + "from_file": "jar/META-INF/LICENSE.txt", "matched_length": 1584, "match_coverage": 100.0, "matcher": "1-hash", @@ -797,6 +801,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -810,6 +815,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -950,6 +956,7 @@ "score": 100.0, "start_line": 24, "end_line": 30, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 25, "match_coverage": 100.0, "matcher": "2-aho", @@ -1133,6 +1140,7 @@ "score": 100.0, "start_line": 6, "end_line": 16, + "from_file": "jar/org/jboss/logging/AbstractLoggerProvider.java", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", @@ -1205,6 +1213,7 @@ "score": 100.0, "start_line": 6, "end_line": 16, + "from_file": "jar/org/jboss/logging/AbstractMdcLoggerProvider.java", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json index baaa02dedfe..3779d255e45 100644 --- a/tests/summarycode/data/score/no_license_ambiguity-expected.json +++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json @@ -61,6 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -242,6 +243,7 @@ "score": 94.12, "start_line": 1, "end_line": 7, + "from_file": "no_license_ambiguity/COPYRIGHT", "matched_length": 48, "match_coverage": 100.0, "matcher": "3-seq", @@ -254,6 +256,7 @@ "score": 97.83, "start_line": 6, "end_line": 9, + "from_file": "no_license_ambiguity/COPYRIGHT", "matched_length": 45, "match_coverage": 100.0, "matcher": "3-seq", @@ -345,6 +348,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "no_license_ambiguity/Cargo.toml", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -392,6 +396,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "no_license_ambiguity/Cargo.toml", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -468,6 +473,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "no_license_ambiguity/LICENSE-APACHE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -526,6 +532,7 @@ "score": 100.0, "start_line": 4, "end_line": 26, + "from_file": "no_license_ambiguity/LICENSE-MIT", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -601,6 +608,7 @@ "score": 57.69, "start_line": 152, "end_line": 157, + "from_file": "no_license_ambiguity/README.md", "matched_length": 15, "match_coverage": 57.69, "matcher": "3-seq", @@ -613,6 +621,7 @@ "score": 100.0, "start_line": 157, "end_line": 157, + "from_file": "no_license_ambiguity/README.md", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -625,6 +634,7 @@ "score": 100.0, "start_line": 4, "end_line": 26, + "from_file": "no_license_ambiguity/LICENSE-MIT", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json index 635e96c8c5e..8e9fe23af3e 100644 --- a/tests/summarycode/data/score/no_license_text-expected.json +++ b/tests/summarycode/data/score/no_license_text-expected.json @@ -54,6 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -479,6 +480,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "no_license_text/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -657,6 +659,7 @@ "score": 100.0, "start_line": 7, "end_line": 7, + "from_file": "no_license_text/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 e918ee60eed..7d358d4dfb1 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 @@ -197,6 +197,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "codebase/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -255,6 +256,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "codebase/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", @@ -352,6 +354,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/src/a.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -364,6 +367,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/src/a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -483,6 +487,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "codebase/tests/test_a.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -495,6 +500,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "codebase/tests/test_a.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -507,6 +513,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, + "from_file": "codebase/tests/test_a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", 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 510fb59f757..d409b0dea6c 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 @@ -241,6 +241,7 @@ "score": 100.0, "start_line": 1, "end_line": 12, + "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING", "matched_length": 102, "match_coverage": 100.0, "matcher": "1-hash", @@ -455,6 +456,7 @@ "score": 100.0, "start_line": 8, "end_line": 19, + "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c", "matched_length": 102, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json index 9d0fae37d5b..83b9be21626 100644 --- a/tests/summarycode/data/summary/holders/clear_holder.expected.json +++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json @@ -129,6 +129,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "clear_holder/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -141,6 +142,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "clear_holder/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -221,6 +223,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "clear_holder/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -279,6 +282,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "clear_holder/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", @@ -376,6 +380,7 @@ "score": 80.0, "start_line": 2, "end_line": 2, + "from_file": "clear_holder/src/a.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -388,6 +393,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "clear_holder/src/a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -497,6 +503,7 @@ "score": 80.0, "start_line": 2, "end_line": 2, + "from_file": "clear_holder/tests/test_a.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -509,6 +516,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, + "from_file": "clear_holder/tests/test_a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json index c07d5b16d0d..01c789a9e4c 100644 --- a/tests/summarycode/data/summary/holders/combined_holders.expected.json +++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json @@ -125,6 +125,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "combined_holders/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -137,6 +138,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "combined_holders/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -217,6 +219,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "combined_holders/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -275,6 +278,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "combined_holders/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", @@ -372,6 +376,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": "combined_holders/src/a.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -384,6 +389,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "combined_holders/src/a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -481,6 +487,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, + "from_file": "combined_holders/tests/test_a.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -493,6 +500,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "combined_holders/tests/test_a.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json index 738b4d30786..6fc56345ef9 100644 --- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json @@ -175,6 +175,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "ambiguous/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -233,6 +234,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "ambiguous/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json index e182be7f856..9254000dc23 100644 --- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json @@ -125,6 +125,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "unambiguous/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -137,6 +138,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "unambiguous/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -207,6 +209,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "unambiguous/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -265,6 +268,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "unambiguous/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", 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 af15c3de512..6bf1b1239f1 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 @@ -77,6 +77,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -151,6 +152,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -300,6 +302,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -312,6 +315,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -384,6 +388,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "codebase/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -468,6 +473,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "codebase/cargo.toml", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -516,6 +522,7 @@ "score": 100.0, "start_line": 4, "end_line": 4, + "from_file": "codebase/cargo.toml", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -582,6 +589,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "codebase/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", @@ -666,6 +674,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "codebase/setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -713,6 +722,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/setup.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 863c9de7079..226abde6257 100644 --- a/tests/summarycode/data/summary/single_file/single_file.expected.json +++ b/tests/summarycode/data/summary/single_file/single_file.expected.json @@ -101,6 +101,7 @@ "score": 100.0, "start_line": 1, "end_line": 132, + "from_file": "codebase/jetty.LICENSE", "matched_length": 996, "match_coverage": 100.0, "matcher": "1-hash", 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 b74c99bbd07..d88b645cd4a 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 @@ -69,6 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -88,6 +89,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -221,6 +223,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -326,6 +329,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -345,6 +349,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -395,6 +400,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -413,6 +419,7 @@ "score": 100.0, "start_line": 13, "end_line": 13, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -431,6 +438,7 @@ "score": 100.0, "start_line": 25, "end_line": 25, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -443,6 +451,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -767,6 +776,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -848,6 +858,7 @@ "score": 100.0, "start_line": 87, "end_line": 87, + "from_file": "pip-22.0.4/setup.cfg", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -860,6 +871,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -872,6 +884,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -921,6 +934,7 @@ "score": 100.0, "start_line": 87, "end_line": 87, + "from_file": "pip-22.0.4/setup.cfg", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -933,6 +947,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -945,6 +960,7 @@ "score": 100.0, "start_line": 3, "end_line": 20, + "from_file": "pip-22.0.4/LICENSE.txt", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -1015,6 +1031,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/setup.py", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1034,6 +1051,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "pip-22.0.4/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1085,6 +1103,7 @@ "score": 100.0, "start_line": 31, "end_line": 31, + "from_file": "pip-22.0.4/setup.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1097,6 +1116,7 @@ "score": 100.0, "start_line": 35, "end_line": 35, + "from_file": "pip-22.0.4/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", 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 6061fa835f1..bf81675c722 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 @@ -69,6 +69,7 @@ "score": 100.0, "start_line": 4, "end_line": 14, + "from_file": null, "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", @@ -279,6 +280,7 @@ "score": 100.0, "start_line": 4, "end_line": 14, + "from_file": "codebase/setup.py", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", @@ -336,6 +338,7 @@ "score": 100.0, "start_line": 4, "end_line": 14, + "from_file": "codebase/setup.py", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", 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 66dfab610bb..7bdcda82f75 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 @@ -73,6 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -212,6 +213,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -224,6 +226,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -296,6 +299,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "codebase/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -356,6 +360,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "codebase/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", @@ -440,6 +445,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "codebase/setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -487,6 +493,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/setup.py", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 bcb84a3b6b9..b0b8425c6d1 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 @@ -125,6 +125,7 @@ "score": 80.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -137,6 +138,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "codebase/README.txt", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -207,6 +209,7 @@ "score": 100.0, "start_line": 1, "end_line": 176, + "from_file": "codebase/apache-2.0.LICENSE", "matched_length": 1410, "match_coverage": 100.0, "matcher": "1-hash", @@ -265,6 +268,7 @@ "score": 100.0, "start_line": 1, "end_line": 18, + "from_file": "codebase/mit.LICENSE", "matched_length": 161, "match_coverage": 100.0, "matcher": "1-hash", 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 5b6fecfad4e..2cb565ded46 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 @@ -274,6 +274,7 @@ "score": 100.0, "start_line": 1, "end_line": 12, + "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING", "matched_length": 102, "match_coverage": 100.0, "matcher": "1-hash", @@ -497,6 +498,7 @@ "score": 100.0, "start_line": 8, "end_line": 19, + "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c", "matched_length": 102, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json index 5a0e0173583..938ad6881fb 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json @@ -2217,6 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -3712,6 +3713,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/FixedMembershipToken.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -3779,6 +3781,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/JGroups/src/GuardedBy.java", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -3852,6 +3855,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/ImmutableReference.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4003,6 +4007,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/RouterStubManager.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4184,6 +4189,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -4196,6 +4202,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4266,6 +4273,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4333,6 +4341,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -4345,6 +4354,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4415,6 +4425,7 @@ "score": 99.69, "start_line": 1, "end_line": 98, + "from_file": "scan/cc0-1.0.LICENSE", "matched_length": 978, "match_coverage": 99.69, "matcher": "3-seq", @@ -6674,6 +6685,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -7487,6 +7499,7 @@ "score": 100.0, "start_line": 198, "end_line": 198, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -7620,6 +7633,7 @@ "score": 100.0, "start_line": 6, "end_line": 25, + "from_file": "scan/zlib/ada/zlib.ads", "matched_length": 176, "match_coverage": 100.0, "matcher": "2-aho", @@ -7687,6 +7701,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -7699,6 +7714,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -7769,6 +7785,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -7781,6 +7798,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -7851,6 +7869,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -7863,6 +7882,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8017,6 +8037,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "matched_length": 32, "match_coverage": 100.0, "matcher": "2-aho", @@ -8120,6 +8141,7 @@ "score": 100.0, "start_line": 17, "end_line": 31, + "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -8229,6 +8251,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8296,6 +8319,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8399,6 +8423,7 @@ "score": 100.0, "start_line": 9, "end_line": 15, + "from_file": "scan/zlib/iostream2/zstream.h", "matched_length": 71, "match_coverage": 100.0, "matcher": "2-aho", @@ -8466,6 +8491,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8533,6 +8559,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8545,6 +8572,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8615,6 +8643,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8627,6 +8656,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", 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 11edf8dc14c..bf297b84414 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 @@ -2217,6 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -3974,6 +3975,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/FixedMembershipToken.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4052,6 +4054,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/JGroups/src/GuardedBy.java", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -4141,6 +4144,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/ImmutableReference.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4313,6 +4317,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/RouterStubManager.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4529,6 +4534,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -4541,6 +4547,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4616,6 +4623,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4705,6 +4713,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -4717,6 +4726,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4792,6 +4802,7 @@ "score": 99.69, "start_line": 1, "end_line": 98, + "from_file": "scan/cc0-1.0.LICENSE", "matched_length": 978, "match_coverage": 99.69, "matcher": "3-seq", @@ -7056,6 +7067,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -7869,6 +7881,7 @@ "score": 100.0, "start_line": 198, "end_line": 198, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -8295,6 +8308,7 @@ "score": 100.0, "start_line": 6, "end_line": 25, + "from_file": "scan/zlib/ada/zlib.ads", "matched_length": 176, "match_coverage": 100.0, "matcher": "2-aho", @@ -8367,6 +8381,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8379,6 +8394,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8454,6 +8470,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8466,6 +8483,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8541,6 +8559,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8553,6 +8572,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8720,6 +8740,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "matched_length": 32, "match_coverage": 100.0, "matcher": "2-aho", @@ -8837,6 +8858,7 @@ "score": 100.0, "start_line": 17, "end_line": 31, + "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -8970,6 +8992,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9042,6 +9065,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9153,6 +9177,7 @@ "score": 100.0, "start_line": 9, "end_line": 15, + "from_file": "scan/zlib/iostream2/zstream.h", "matched_length": 71, "match_coverage": 100.0, "matcher": "2-aho", @@ -9231,6 +9256,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -9314,6 +9340,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9326,6 +9353,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -9401,6 +9429,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9413,6 +9442,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", 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 c6b5c2dd488..26c299034f7 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json @@ -2217,6 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -4044,6 +4045,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/FixedMembershipToken.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4143,6 +4145,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/JGroups/src/GuardedBy.java", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -4248,6 +4251,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/ImmutableReference.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4495,6 +4499,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/RouterStubManager.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -4820,6 +4825,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -4832,6 +4838,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -4934,6 +4941,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -5033,6 +5041,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -5045,6 +5054,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -5147,6 +5157,7 @@ "score": 99.69, "start_line": 1, "end_line": 98, + "from_file": "scan/cc0-1.0.LICENSE", "matched_length": 978, "match_coverage": 99.69, "matcher": "3-seq", @@ -7438,6 +7449,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -8251,6 +8263,7 @@ "score": 100.0, "start_line": 198, "end_line": 198, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -8555,6 +8568,7 @@ "score": 100.0, "start_line": 6, "end_line": 25, + "from_file": "scan/zlib/ada/zlib.ads", "matched_length": 176, "match_coverage": 100.0, "matcher": "2-aho", @@ -8654,6 +8668,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8666,6 +8681,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8768,6 +8784,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8780,6 +8797,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -8882,6 +8900,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -8894,6 +8913,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -9152,6 +9172,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "matched_length": 32, "match_coverage": 100.0, "matcher": "2-aho", @@ -9319,6 +9340,7 @@ "score": 100.0, "start_line": 17, "end_line": 31, + "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -9492,6 +9514,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9591,6 +9614,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9758,6 +9782,7 @@ "score": 100.0, "start_line": 9, "end_line": 15, + "from_file": "scan/zlib/iostream2/zstream.h", "matched_length": 71, "match_coverage": 100.0, "matcher": "2-aho", @@ -9857,6 +9882,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -9956,6 +9982,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -9968,6 +9995,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -10070,6 +10098,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -10082,6 +10111,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", 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 d6cbedd5f92..9042d65ef6b 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 @@ -22,11 +22,11 @@ "system_environment": { "operating_system": "linux", "cpu_architecture": "64", - "platform": "Linux-5.15.0-73-generic-x86_64-with-glibc2.29", - "platform_version": "#80~20.04.1-Ubuntu SMP Wed May 17 14:58:14 UTC 2023", - "python_version": "3.8.10 (default, May 26 2023, 14:05:08) \n[GCC 9.4.0]" + "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]" }, - "spdx_license_list_version": "3.20", + "spdx_license_list_version": "3.22", "files_count": 26 } } @@ -373,6 +373,7 @@ "score": 99.69, "start_line": 1, "end_line": 98, + "from_file": "scan/cc0-1.0.LICENSE", "matched_length": 978, "match_coverage": 99.69, "matcher": "3-seq", @@ -433,6 +434,7 @@ "score": 100.0, "start_line": 198, "end_line": 198, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -581,6 +583,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -593,6 +596,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -668,6 +672,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -740,6 +745,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -752,6 +758,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -909,6 +916,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/FixedMembershipToken.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -981,6 +989,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/JGroups/src/GuardedBy.java", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -1059,6 +1068,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/ImmutableReference.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -1225,6 +1235,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/RouterStubManager.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -1385,6 +1396,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1397,6 +1409,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1472,6 +1485,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1484,6 +1498,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1559,6 +1574,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1571,6 +1587,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1646,6 +1663,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1718,6 +1736,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1730,6 +1749,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1805,6 +1825,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1817,6 +1838,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1933,6 +1955,7 @@ "score": 100.0, "start_line": 6, "end_line": 25, + "from_file": "scan/zlib/ada/zlib.ads", "matched_length": 176, "match_coverage": 100.0, "matcher": "2-aho", @@ -2099,6 +2122,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "matched_length": 32, "match_coverage": 100.0, "matcher": "2-aho", @@ -2212,6 +2236,7 @@ "score": 100.0, "start_line": 17, "end_line": 31, + "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -2331,6 +2356,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -2403,6 +2429,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -2516,6 +2543,7 @@ "score": 100.0, "start_line": 9, "end_line": 15, + "from_file": "scan/zlib/iostream2/zstream.h", "matched_length": 71, "match_coverage": 100.0, "matcher": "2-aho", 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 33e798b379a..25709d6bad8 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 @@ -403,6 +403,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/FixedMembershipToken.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -471,6 +472,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/JGroups/src/GuardedBy.java", "matched_length": 14, "match_coverage": 100.0, "matcher": "2-aho", @@ -545,6 +547,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/ImmutableReference.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -699,6 +702,7 @@ "score": 100.0, "start_line": 7, "end_line": 20, + "from_file": "scan/JGroups/src/RouterStubManager.java", "matched_length": 125, "match_coverage": 100.0, "matcher": "2-aho", @@ -884,6 +888,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -896,6 +901,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -967,6 +973,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1035,6 +1042,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/arch/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1047,6 +1055,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/arch/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1118,6 +1127,7 @@ "score": 99.69, "start_line": 1, "end_line": 98, + "from_file": "scan/cc0-1.0.LICENSE", "matched_length": 978, "match_coverage": 99.69, "matcher": "3-seq", @@ -1174,6 +1184,7 @@ "score": 100.0, "start_line": 198, "end_line": 198, + "from_file": "scan/package.json", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", @@ -1310,6 +1321,7 @@ "score": 100.0, "start_line": 6, "end_line": 25, + "from_file": "scan/zlib/ada/zlib.ads", "matched_length": 176, "match_coverage": 100.0, "matcher": "2-aho", @@ -1378,6 +1390,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/adler32.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1390,6 +1403,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1461,6 +1475,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1473,6 +1488,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1544,6 +1560,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/deflate.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1556,6 +1573,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -1713,6 +1731,7 @@ "score": 100.0, "start_line": 4, "end_line": 5, + "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "matched_length": 32, "match_coverage": 100.0, "matcher": "2-aho", @@ -1818,6 +1837,7 @@ "score": 100.0, "start_line": 17, "end_line": 31, + "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "matched_length": 132, "match_coverage": 100.0, "matcher": "2-aho", @@ -1929,6 +1949,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -1997,6 +2018,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/infback9/infback9.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -2102,6 +2124,7 @@ "score": 100.0, "start_line": 9, "end_line": 15, + "from_file": "scan/zlib/iostream2/zstream.h", "matched_length": 71, "match_coverage": 100.0, "matcher": "2-aho", @@ -2170,6 +2193,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -2238,6 +2262,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.c", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -2250,6 +2275,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", @@ -2321,6 +2347,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "scan/zlib/zutil.h", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -2333,6 +2360,7 @@ "score": 100.0, "start_line": 6, "end_line": 23, + "from_file": "scan/zlib/zlib.h", "matched_length": 144, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json index 7ad26fe91fb..7a51fa53877 100644 --- a/tests/summarycode/data/tallies/packages/expected.json +++ b/tests/summarycode/data/tallies/packages/expected.json @@ -34,6 +34,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -115,6 +116,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189,6 +191,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1148,6 +1151,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -1249,6 +1253,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -1336,6 +1341,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 8bac98d9d6d..7f4d3774bc5 100644 --- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json +++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json @@ -42,6 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -61,6 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": null, "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -300,6 +302,7 @@ "score": 100.0, "start_line": 3, "end_line": 22, + "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT", "matched_length": 161, "match_coverage": 100.0, "matcher": "2-aho", @@ -368,6 +371,7 @@ "score": 100.0, "start_line": 20, "end_line": 20, + "from_file": "base64-arraybuffer-0.1.4/README.md", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -473,6 +477,7 @@ "score": 100.0, "start_line": 6, "end_line": 6, + "from_file": "base64-arraybuffer-0.1.4/lib/base64-arraybuffer.js", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -570,6 +575,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -589,6 +595,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -682,6 +689,7 @@ "score": 100.0, "start_line": 18, "end_line": 20, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -694,6 +702,7 @@ "score": 100.0, "start_line": 21, "end_line": 21, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 ef137b36c97..0ae3e652d0a 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 @@ -11,6 +11,7 @@ "matches": [ { "score": 4.71, + "from_file": "README.multi-orig-tarball-package", "start_line": 1, "end_line": 3, "matched_length": 4, @@ -42,6 +43,7 @@ "score": 4.71, "start_line": 1, "end_line": 3, + "from_file": "README.multi-orig-tarball-package", "matched_length": 4, "match_coverage": 4.71, "matcher": "3-seq", 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 223efdde68d..037e94ad1a5 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 @@ -20,6 +20,7 @@ "matches": [ { "score": 86.89, + "from_file": "unknown-license.txt", "start_line": 1, "end_line": 10, "matched_length": 53, @@ -53,6 +54,7 @@ "score": 86.89, "start_line": 1, "end_line": 10, + "from_file": "unknown-license.txt", "matched_length": 53, "match_coverage": 100.0, "matcher": "6-unknown", 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 1dd0e7d572b..4c65a5765c9 100644 --- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json +++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json @@ -17,6 +17,7 @@ "matches": [ { "score": 86.89, + "from_file": "unknown-license.txt", "start_line": 1, "end_line": 10, "matched_length": 53, @@ -48,6 +49,7 @@ "score": 86.89, "start_line": 1, "end_line": 10, + "from_file": "unknown-license.txt", "matched_length": 53, "match_coverage": 100.0, "matcher": "6-unknown", From dbffe4351b740d162a6afc11115626cb2cfc4828 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 7 Dec 2023 17:16:21 +0530 Subject: [PATCH 02/11] Fix from-file bug for codebase packages Here `from-file` attributes were being assigned after creation of top level packages so we had them empty. Adds a temporary fix to this. Signed-off-by: Ayan Sinha Mahapatra --- src/packagedcode/plugin_package.py | 14 +- .../data/common/manifests-expected.json | 10 +- .../data/common/manifests-expected.jsonlines | 10 +- .../data/common/manifests-expected.yaml | 10 +- .../yaml/package-and-licenses-expected.yaml | 2 +- ...tional_license_combined_test.expected.json | 5 + ...ional_license_directory_test.expected.json | 2 + ...ditional_license_plugin_test.expected.json | 1 + ...-matched-text-with-reference.expected.json | 2 +- .../scan-with-reference.expected.json | 2 +- .../package/package.expected.json | 2 +- .../data/about/aboutfiles.expected.json | 4 +- ...r-layer.tar.xz-get-installed-expected.json | 28 +- ...-container-layer.tar.xz-scan-expected.json | 28 +- .../rootfs/alpine-rootfs.tar.xz-expected.json | 28 +- .../data/bower/scan-expected.json | 6 +- .../data/build/buck/end2end-expected.json | 2 +- .../data/cargo/scan.expected.json | 4 +- .../data/chef/package.scan.expected.json | 2 +- .../assemble/many-podspecs-expected.json | 12 +- .../many-podspecs-with-license-expected.json | 12 +- .../assemble/multiple-podspec-expected.json | 4 +- .../assemble/single-podspec-expected.json | 2 +- .../solo/RxDataSources.podspec-expected.json | 2 +- .../data/debian/basic-rootfs-expected.json | 8 +- ...r-layer.tar.xz.get-installed-expected.json | 8 +- ...-container-layer.tar.xz.scan-expected.json | 8 +- ...cted-with-test-manifests-with-license.json | 2 +- ...instance-expected-with-test-manifests.json | 2 +- ...n-package-instance-expected-with-uuid.json | 2 +- .../python-package-instance-expected.json | 2 +- ...ackage-instance-with-license-expected.json | 2 +- .../activemq-camel.expected.json | 2 +- .../jquery-form-3.51.0.expected.json | 12 +- .../fizzler.expected.json | 2 +- .../flutter_playtabs_bridge.expected.json | 2 +- ...ytabs_bridge_without_license.expected.json | 2 +- .../nanopb.expected.json | 2 +- .../nanopb_without_license.expected.json | 2 +- .../reference-to-package/base.expected.json | 4 +- .../google_appengine_sdk.expected.json | 18 +- .../paddlenlp.expected.json | 12 +- .../johnzon-jsonb-1.2.11-expected.json | 2 +- .../assemble/numbers-1.7.4-expected.json | 2 +- ...htrace-core-4.0.0-incubating-expected.json | 4 +- .../data/npm/electron/package.expected.json | 2 +- .../get_package_resources.scan.expected.json | 2 +- .../data/npm/scan-nested/scan.expected.json | 4 +- .../data/plugin/about-package-expected.json | 4 +- .../data/plugin/bower-package-expected.json | 2 +- .../data/plugin/cargo-package-expected.json | 2 +- .../data/plugin/chef-package-expected.json | 2 +- .../data/plugin/conda-package-expected.json | 2 +- .../data/plugin/cran-package-expected.json | 2 +- .../data/plugin/freebsd-package-expected.json | 2 +- .../get_installed_packages-expected.json | 8 +- .../data/plugin/haxe-package-expected.json | 2 +- .../data/plugin/maven-package-expected.json | 28 +- .../maven-package-with-license-expected.json | 28 +- .../data/plugin/nuget-package-expected.json | 2 +- .../plugin/phpcomposer-package-expected.json | 2 +- .../data/plugin/python-package-expected.json | 14 +- .../data/plugin/rpm-package-expected.json | 2 +- .../plugin/rubygems-package-expected.json | 2 +- .../site-packages/site-packages-expected.json | 6 +- .../data/pypi/solo-metadata/expected.json | 2 +- .../pip-22.0.4-pypi-package-expected.json | 4 +- ....4-pypi-package-with-license-expected.json | 4 +- .../celery-expected.json | 4 +- .../daglib_wheel_extracted-expected.json | 4 +- .../bdb-fedora-rootfs.tar.xz-expected.json | 296 +++++++++--------- .../data/composer/composer.expected.json | 2 +- ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json | 2 +- .../classify/with_package_data.expected.json | 4 +- .../component-package-build-expected.json | 2 +- .../component-package-expected.json | 2 +- ...t-counted-in-license-holders-expected.json | 2 +- .../package-fileset-expected.json | 2 +- .../package-manifest-expected.json | 2 +- .../data/score/basic-expected.json | 2 +- ...consistent_licenses_copyleft-expected.json | 2 +- .../summarycode/data/score/jar-expected.json | 4 +- .../score/no_license_ambiguity-expected.json | 2 +- .../data/score/no_license_text-expected.json | 2 +- .../multiple_package_data.expected.json | 4 +- .../summary-without-holder-pypi.expected.json | 4 +- ...holder_from_package_resource.expected.json | 2 +- .../with_package_data.expected.json | 2 +- .../full_tallies/tallies.expected.json | 2 +- .../tallies_by_facet.expected.json | 2 +- .../tallies_details.expected.json | 2 +- .../data/tallies/packages/expected.json | 6 +- .../no_todo/base64-arraybuffer.expected.json | 4 +- 93 files changed, 401 insertions(+), 383 deletions(-) diff --git a/src/packagedcode/plugin_package.py b/src/packagedcode/plugin_package.py index 2e1e4ad6e07..5ca2ee8654e 100644 --- a/src/packagedcode/plugin_package.py +++ b/src/packagedcode/plugin_package.py @@ -25,11 +25,11 @@ from licensedcode.cache import build_spdx_license_expression from licensedcode.cache import get_cache from licensedcode.detection import DetectionRule +from licensedcode.detection import populate_matches_with_path from packagedcode import get_package_handler from packagedcode.licensing import add_referenced_license_matches_for_package from packagedcode.licensing import add_referenced_license_detection_from_package from packagedcode.licensing import add_license_from_sibling_file -from packagedcode.licensing import get_license_detection_mappings from packagedcode.licensing import get_license_expression_from_detection_mappings from packagedcode.models import add_to_package from packagedcode.models import Dependency @@ -328,7 +328,17 @@ def create_package_and_deps(codebase, package_adder=add_to_package, strip_root=F strip_root=strip_root, **kwargs ) - codebase.attributes.packages.extend(pkg.to_dict() for pkg in packages) + + package_mappings = [] + for package in packages: + for detection in package.license_detections: + populate_matches_with_path( + matches=detection["matches"], + path=package.datafile_paths[0], + ) + package_mappings.append(package.to_dict()) + + codebase.attributes.packages.extend(package_mappings) codebase.attributes.dependencies.extend(dep.to_dict() for dep in dependencies) diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json index d230a0bb395..db58308da5a 100644 --- a/tests/formattedcode/data/common/manifests-expected.json +++ b/tests/formattedcode/data/common/manifests-expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -48,7 +48,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -127,7 +127,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -147,7 +147,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -222,7 +222,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines index 8dfc9abe6f5..41b80c9de38 100644 --- a/tests/formattedcode/data/common/manifests-expected.jsonlines +++ b/tests/formattedcode/data/common/manifests-expected.jsonlines @@ -66,7 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -80,7 +80,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "manifests/maven/persistence-api-1.0.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -159,7 +159,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -179,7 +179,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-mapping/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -254,7 +254,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "manifests/npm-license-string/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml index caaaf63c2ae..fa5639c179f 100644 --- a/tests/formattedcode/data/common/manifests-expected.yaml +++ b/tests/formattedcode/data/common/manifests-expected.yaml @@ -96,7 +96,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 - from_file: + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 8 match_coverage: '100.0' matcher: 2-aho @@ -108,7 +108,7 @@ packages: - score: '100.0' start_line: 2 end_line: 2 - from_file: + from_file: manifests/maven/persistence-api-1.0.pom matched_length: 7 match_coverage: '100.0' matcher: 2-aho @@ -174,7 +174,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 - from_file: + from_file: manifests/npm-license-mapping/package.json matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -189,7 +189,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 - from_file: + from_file: manifests/npm-license-mapping/package.json matched_length: 3 match_coverage: '100.0' matcher: 1-hash @@ -254,7 +254,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 - from_file: + from_file: manifests/npm-license-string/package.json matched_length: 1 match_coverage: '100.0' matcher: 1-spdx-id diff --git a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml index 54f77567007..408814a51b0 100644 --- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml +++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml @@ -92,7 +92,7 @@ packages: - score: '100.0' start_line: 1 end_line: 1 - from_file: + from_file: package-and-licenses/setup.cfg matched_length: 3 match_coverage: '100.0' matcher: 1-hash 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 190a7381c46..94cc30b044f 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 @@ -336,6 +336,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "additional_license_combined_test.txt", "matched_length": 11, "match_coverage": 100.0, "matcher": "2-aho", @@ -348,6 +349,7 @@ "score": 100.0, "start_line": 3, "end_line": 3, + "from_file": "additional_license_combined_test.txt", "matched_length": 12, "match_coverage": 100.0, "matcher": "2-aho", @@ -360,6 +362,7 @@ "score": 100.0, "start_line": 5, "end_line": 5, + "from_file": "additional_license_combined_test.txt", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -372,6 +375,7 @@ "score": 100.0, "start_line": 5, "end_line": 9, + "from_file": "additional_license_combined_test.txt", "matched_length": 69, "match_coverage": 100.0, "matcher": "2-aho", @@ -384,6 +388,7 @@ "score": 100.0, "start_line": 12, "end_line": 12, + "from_file": "additional_license_combined_test.txt", "matched_length": 4, "match_coverage": 100.0, "matcher": "2-aho", 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 24e591bb1f6..d094e94c092 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 @@ -144,6 +144,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "additional_license_directory_test.txt", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", @@ -156,6 +157,7 @@ "score": 100.0, "start_line": 1, "end_line": 5, + "from_file": "additional_license_directory_test.txt", "matched_length": 69, "match_coverage": 100.0, "matcher": "2-aho", 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 18f31e4886b..2814039c2ad 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 @@ -84,6 +84,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, + "from_file": "additional_license_plugin_test.txt", "matched_length": 11, "match_coverage": 100.0, "matcher": "1-hash", 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 5387cab7070..c33a5082eed 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 @@ -47,7 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 9df375489f1..d917b335753 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 @@ -47,7 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/licensedcode/data/plugin_license/package/package.expected.json b/tests/licensedcode/data/plugin_license/package/package.expected.json index 14a16222e59..466167ae148 100644 --- a/tests/licensedcode/data/plugin_license/package/package.expected.json +++ b/tests/licensedcode/data/plugin_license/package/package.expected.json @@ -47,7 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json index 441cea36886..596527497af 100644 --- a/tests/packagedcode/data/about/aboutfiles.expected.json +++ b/tests/packagedcode/data/about/aboutfiles.expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "aboutfiles/apipkg.ABOUT", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -117,7 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "aboutfiles/appdirs.ABOUT", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 99d01f6bddc..81813870e32 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 @@ -43,7 +43,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -253,7 +253,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -355,7 +355,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -502,7 +502,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -712,7 +712,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1165,7 +1165,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1267,7 +1267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1459,7 +1459,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1561,7 +1561,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1651,7 +1651,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1753,7 +1753,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1852,7 +1852,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1942,7 +1942,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -2068,7 +2068,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 5dcf41e2044..078b55374e9 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 @@ -44,7 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -135,7 +135,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -226,7 +226,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -317,7 +317,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -426,7 +426,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -679,7 +679,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -770,7 +770,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -870,7 +870,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -961,7 +961,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1040,7 +1040,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1131,7 +1131,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1210,7 +1210,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1289,7 +1289,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1368,7 +1368,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 34faa90c932..2f842f61656 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 @@ -44,7 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -135,7 +135,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -226,7 +226,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -344,7 +344,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -597,7 +597,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -688,7 +688,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -806,7 +806,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -897,7 +897,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -988,7 +988,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1067,7 +1067,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1158,7 +1158,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1237,7 +1237,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 4, "match_coverage": 100.0, "matcher": "1-hash", @@ -1316,7 +1316,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 11, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -1395,7 +1395,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alpine-rootfs/lib/apk/db/installed", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/bower/scan-expected.json b/tests/packagedcode/data/bower/scan-expected.json index 5f0d1a96336..cc67727af06 100644 --- a/tests/packagedcode/data/bower/scan-expected.json +++ b/tests/packagedcode/data/bower/scan-expected.json @@ -53,7 +53,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/bower.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -73,7 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/bower.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -93,7 +93,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/bower.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/build/buck/end2end-expected.json b/tests/packagedcode/data/build/buck/end2end-expected.json index 165e243c69c..d537d90955c 100644 --- a/tests/packagedcode/data/build/buck/end2end-expected.json +++ b/tests/packagedcode/data/build/buck/end2end-expected.json @@ -80,7 +80,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "end2end/subdir2/BUCK", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json index d2db5db3cf5..16f01cce9fd 100644 --- a/tests/packagedcode/data/cargo/scan.expected.json +++ b/tests/packagedcode/data/cargo/scan.expected.json @@ -42,7 +42,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/Cargo.toml", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -124,7 +124,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/dac/Cargo.toml", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/chef/package.scan.expected.json b/tests/packagedcode/data/chef/package.scan.expected.json index 59cabb7c08e..d4b31392b54 100644 --- a/tests/packagedcode/data/chef/package.scan.expected.json +++ b/tests/packagedcode/data/chef/package.scan.expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package/metadata.rb", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json index ddde1277f78..53b23879b57 100644 --- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -117,7 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/Amplify.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -192,7 +192,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AmplifyPlugins.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -267,7 +267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AmplifyTestCommon.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -342,7 +342,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AWSPluginsCore.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -417,7 +417,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 c2f36e1bdcf..4a488e249fe 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -117,7 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/Amplify.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -192,7 +192,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AmplifyPlugins.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -267,7 +267,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AmplifyTestCommon.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -342,7 +342,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AWSPluginsCore.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -417,7 +417,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json index c59151ae9fa..b8db597e8ff 100644 --- a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "multiple-podspec/RxDataSources.podspec", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -117,7 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "multiple-podspec/Differentiator.podspec", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json index 80b4fe6c7f7..c5ecde8ac5d 100644 --- a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "single-podspec/RxDataSources.podspec", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 ea44fa27956..3bea8bbbd42 100644 --- a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "RxDataSources.podspec", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json index 23d17a65151..635617d3c9c 100644 --- a/tests/packagedcode/data/debian/basic-rootfs-expected.json +++ b/tests/packagedcode/data/debian/basic-rootfs-expected.json @@ -46,7 +46,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -66,7 +66,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -86,7 +86,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -106,7 +106,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", 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 00f92cb3645..a73af976ccd 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 @@ -45,7 +45,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -65,7 +65,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -85,7 +85,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -105,7 +105,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", 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 6221d2eeafc..eb3e4fb2faf 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 @@ -46,7 +46,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -66,7 +66,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -86,7 +86,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -106,7 +106,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, - "from_file": null, + "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", 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 01ee518d566..99ab638eab1 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 @@ -52,7 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 f4fcb8bb92f..58dc4b93e97 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 @@ -52,7 +52,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 131496f5f4c..be25a3049a7 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "setup.cfg", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json index 131496f5f4c..be25a3049a7 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "setup.cfg", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", 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 aa11ccdf9aa..8ee2d1d1336 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "setup.cfg", "matched_length": 7, "match_coverage": 100.0, "matcher": "1-hash", 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 e8ce20cfc1b..a36d714cd78 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 @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 3, "end_line": 16, - "from_file": null, + "from_file": "activemq-camel-pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", 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 9ca21ab15a5..9b3593a0606 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 @@ -143,7 +143,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "composer.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -163,7 +163,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "composer.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -242,7 +242,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -262,7 +262,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -282,7 +282,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -302,7 +302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", 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 ada563f4c12..9de3371e388 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 @@ -42,7 +42,7 @@ "score": 16.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Fizzler.nuspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 83436d9d4b1..38097deccf8 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "flutter_paytabs_bridge.podspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 d2db45eba94..8490fd9c97f 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "flutter_paytabs_bridge.podspec", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 725614b0115..8f453614eef 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "nanopb.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 8f3341ced70..31ed2a9f8d5 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "nanopb.podspec", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 856c5abbc76..62719cbd618 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 @@ -54,7 +54,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "base-example/django.po", + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -261,7 +261,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "base-example/django.po", + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 6d6869c311a..2213a0d8322 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 @@ -54,7 +54,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -147,7 +147,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", + "from_file": "django-1.3/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -416,7 +416,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -468,7 +468,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -544,7 +544,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -596,7 +596,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -648,7 +648,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", + "from_file": "django-1.2/setup.py", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1217,7 +1217,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", + "from_file": "django-1.3/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -1293,7 +1293,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", + "from_file": "django-1.3/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 7dd320e5b71..95a9709ee86 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 @@ -48,7 +48,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -68,7 +68,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -648,7 +648,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -662,7 +662,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", @@ -714,7 +714,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -728,7 +728,7 @@ "score": 95.0, "start_line": 1, "end_line": 1, - "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", + "from_file": "setup.py", "matched_length": 6, "match_coverage": 100.0, "matcher": "1-hash", 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 576045c0316..4dd02a8a2f4 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 @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 3, "end_line": 18, - "from_file": null, + "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", 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 f19599ec741..77fb57fa680 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 @@ -49,7 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "matched_length": 12, "match_coverage": 100.0, "matcher": "1-hash", 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 6aedd0078f1..e22173a6aa3 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 @@ -271,7 +271,7 @@ "score": 100.0, "start_line": 2, "end_line": 15, - "from_file": null, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", @@ -339,7 +339,7 @@ "score": 100.0, "start_line": 2, "end_line": 11, - "from_file": null, + "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "matched_length": 119, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/npm/electron/package.expected.json b/tests/packagedcode/data/npm/electron/package.expected.json index 417c549edd8..5e1da273166 100644 --- a/tests/packagedcode/data/npm/electron/package.expected.json +++ b/tests/packagedcode/data/npm/electron/package.expected.json @@ -44,7 +44,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 c78c109a737..e467d8c503d 100644 --- a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json +++ b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "get_package_resources/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/npm/scan-nested/scan.expected.json b/tests/packagedcode/data/npm/scan-nested/scan.expected.json index dc468e55535..8803bbd980a 100644 --- a/tests/packagedcode/data/npm/scan-nested/scan.expected.json +++ b/tests/packagedcode/data/npm/scan-nested/scan.expected.json @@ -66,7 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -173,7 +173,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/node_modules/sequelize/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/about-package-expected.json b/tests/packagedcode/data/plugin/about-package-expected.json index fe8f0113872..19627c232bd 100644 --- a/tests/packagedcode/data/plugin/about-package-expected.json +++ b/tests/packagedcode/data/plugin/about-package-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "apipkg.ABOUT", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -117,7 +117,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "appdirs.ABOUT", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/bower-package-expected.json b/tests/packagedcode/data/plugin/bower-package-expected.json index a29f5a73e9a..417972ece46 100644 --- a/tests/packagedcode/data/plugin/bower-package-expected.json +++ b/tests/packagedcode/data/plugin/bower-package-expected.json @@ -46,7 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "bower.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/cargo-package-expected.json b/tests/packagedcode/data/plugin/cargo-package-expected.json index f9ab4e6ed47..093111a6517 100644 --- a/tests/packagedcode/data/plugin/cargo-package-expected.json +++ b/tests/packagedcode/data/plugin/cargo-package-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Cargo.toml", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json index ae06fff76fb..f651a998235 100644 --- a/tests/packagedcode/data/plugin/chef-package-expected.json +++ b/tests/packagedcode/data/plugin/chef-package-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "metadata.rb", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/conda-package-expected.json b/tests/packagedcode/data/plugin/conda-package-expected.json index 5700b26136a..b3ff9f94035 100644 --- a/tests/packagedcode/data/plugin/conda-package-expected.json +++ b/tests/packagedcode/data/plugin/conda-package-expected.json @@ -34,7 +34,7 @@ "score": 80.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "info/recipe.tar-extract/recipe/meta.yaml", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/cran-package-expected.json b/tests/packagedcode/data/plugin/cran-package-expected.json index b837a863ed3..8ff3e7f00dc 100644 --- a/tests/packagedcode/data/plugin/cran-package-expected.json +++ b/tests/packagedcode/data/plugin/cran-package-expected.json @@ -49,7 +49,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "DESCRIPTION", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/freebsd-package-expected.json b/tests/packagedcode/data/plugin/freebsd-package-expected.json index f0b2699c12b..f1bcc51e1b2 100644 --- a/tests/packagedcode/data/plugin/freebsd-package-expected.json +++ b/tests/packagedcode/data/plugin/freebsd-package-expected.json @@ -47,7 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "+COMPACT_MANIFEST", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json index adf90c2d995..bdbceb111de 100644 --- a/tests/packagedcode/data/plugin/get_installed_packages-expected.json +++ b/tests/packagedcode/data/plugin/get_installed_packages-expected.json @@ -45,7 +45,7 @@ "score": 100.0, "start_line": 23, "end_line": 45, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 200, "match_coverage": 100.0, "matcher": "2-aho", @@ -65,7 +65,7 @@ "score": 100.0, "start_line": 50, "end_line": 70, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 201, "match_coverage": 100.0, "matcher": "2-aho", @@ -85,7 +85,7 @@ "score": 100.0, "start_line": 76, "end_line": 98, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 213, "match_coverage": 100.0, "matcher": "2-aho", @@ -105,7 +105,7 @@ "score": 100.0, "start_line": 105, "end_line": 127, - "from_file": null, + "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status", "matched_length": 199, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/packagedcode/data/plugin/haxe-package-expected.json b/tests/packagedcode/data/plugin/haxe-package-expected.json index c04039952a4..9e0b64c8ee0 100644 --- a/tests/packagedcode/data/plugin/haxe-package-expected.json +++ b/tests/packagedcode/data/plugin/haxe-package-expected.json @@ -47,7 +47,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "haxelib.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json index 4c0796268b9..79cc96146ff 100644 --- a/tests/packagedcode/data/plugin/maven-package-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-expected.json @@ -226,7 +226,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "aopalliance-1.0/aopalliance-1.0.pom", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -240,7 +240,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "aopalliance-1.0/aopalliance-1.0.pom", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -757,7 +757,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "commons-validator-1.2.0/commons-validator-1.2.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -987,7 +987,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1160,7 +1160,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "foo-pom/foo-pom.xml", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1174,7 +1174,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "foo-pom/foo-pom.xml", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -1376,7 +1376,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -1390,7 +1390,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1467,7 +1467,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "log4j/log4j-pom.xml", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -1536,7 +1536,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "logback-access/logback-access.pom", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1550,7 +1550,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "logback-access/logback-access.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -2022,7 +2022,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-2.5.4/spring-2.5.4.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2099,7 +2099,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-orm-2.5.3/spring-orm-2.5.3.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2176,7 +2176,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", 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 4c0796268b9..79cc96146ff 100644 --- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json @@ -226,7 +226,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "aopalliance-1.0/aopalliance-1.0.pom", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -240,7 +240,7 @@ "score": 50.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "aopalliance-1.0/aopalliance-1.0.pom", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -757,7 +757,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "commons-validator-1.2.0/commons-validator-1.2.0.pom", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -987,7 +987,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "matched_length": 3, "match_coverage": 100.0, "matcher": "2-aho", @@ -1160,7 +1160,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "foo-pom/foo-pom.xml", "matched_length": 6, "match_coverage": 100.0, "matcher": "2-aho", @@ -1174,7 +1174,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "foo-pom/foo-pom.xml", "matched_length": 8, "match_coverage": 100.0, "matcher": "2-aho", @@ -1376,7 +1376,7 @@ "score": 75.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -1390,7 +1390,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -1467,7 +1467,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "log4j/log4j-pom.xml", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -1536,7 +1536,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "logback-access/logback-access.pom", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -1550,7 +1550,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "logback-access/logback-access.pom", "matched_length": 7, "match_coverage": 100.0, "matcher": "2-aho", @@ -2022,7 +2022,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-2.5.4/spring-2.5.4.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2099,7 +2099,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-orm-2.5.3/spring-orm-2.5.3.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", @@ -2176,7 +2176,7 @@ "score": 100.0, "start_line": 1, "end_line": 2, - "from_file": null, + "from_file": "spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/nuget-package-expected.json b/tests/packagedcode/data/plugin/nuget-package-expected.json index 14cbe8746da..3fae5fdc5ca 100644 --- a/tests/packagedcode/data/plugin/nuget-package-expected.json +++ b/tests/packagedcode/data/plugin/nuget-package-expected.json @@ -49,7 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Castle.Core.nuspec", "matched_length": 9, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json index 9052da56499..8bf22baccb1 100644 --- a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json +++ b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json @@ -49,7 +49,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "composer.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/packagedcode/data/plugin/python-package-expected.json b/tests/packagedcode/data/plugin/python-package-expected.json index 01ee424423e..8097fc81433 100644 --- a/tests/packagedcode/data/plugin/python-package-expected.json +++ b/tests/packagedcode/data/plugin/python-package-expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "arpy/setup.py", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -125,7 +125,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -145,7 +145,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -212,7 +212,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Six/metadata.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -293,7 +293,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Six/Six.dist-info/METADATA", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -313,7 +313,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "Six/Six.dist-info/METADATA", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", @@ -388,7 +388,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "TicketImport/PKG-INFO", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/rpm-package-expected.json b/tests/packagedcode/data/plugin/rpm-package-expected.json index 7fc3567b857..73a43bb87b8 100644 --- a/tests/packagedcode/data/plugin/rpm-package-expected.json +++ b/tests/packagedcode/data/plugin/rpm-package-expected.json @@ -34,7 +34,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "alfandega-2.0-1.7.3.noarch.rpm", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/plugin/rubygems-package-expected.json b/tests/packagedcode/data/plugin/rubygems-package-expected.json index 9559ef1c5a1..7eb242f462e 100644 --- a/tests/packagedcode/data/plugin/rubygems-package-expected.json +++ b/tests/packagedcode/data/plugin/rubygems-package-expected.json @@ -63,7 +63,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "m2r-2.1.0.gem", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 7486ebafa8e..cf4f6e91175 100644 --- a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json +++ b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json @@ -45,7 +45,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -132,7 +132,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", @@ -152,7 +152,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json index bccbf9e28ae..0260c651610 100644 --- a/tests/packagedcode/data/pypi/solo-metadata/expected.json +++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json @@ -69,7 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 18, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 bf8302a84f5..264b47117c8 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 @@ -55,7 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -75,7 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 018b90bb369..3470d1434f2 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 @@ -55,7 +55,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -75,7 +75,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 980149239ec..fc6b86bb396 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 @@ -58,7 +58,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "celery/celery.egg-info/PKG-INFO", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -78,7 +78,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "celery/celery.egg-info/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 3a1cd96816a..554cb13d3f0 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 @@ -46,7 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -66,7 +66,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 82b3263a4d7..bb35fec90cf 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 @@ -36,7 +36,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -306,7 +306,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -414,7 +414,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -483,7 +483,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -17205,7 +17205,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17219,7 +17219,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17233,7 +17233,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17302,7 +17302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17316,7 +17316,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17330,7 +17330,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -17816,7 +17816,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -18833,7 +18833,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -18950,7 +18950,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -19058,7 +19058,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19127,7 +19127,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -19424,7 +19424,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19505,7 +19505,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -19640,7 +19640,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -19721,7 +19721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -20108,7 +20108,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -20122,7 +20122,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -20230,7 +20230,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21094,7 +21094,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21108,7 +21108,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21225,7 +21225,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21239,7 +21239,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -21383,7 +21383,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21473,7 +21473,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -21977,7 +21977,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22076,7 +22076,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22157,7 +22157,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22310,7 +22310,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22324,7 +22324,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22468,7 +22468,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -22558,7 +22558,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -22657,7 +22657,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22765,7 +22765,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -22834,7 +22834,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -22942,7 +22942,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -23041,7 +23041,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -23055,7 +23055,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -23136,7 +23136,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -23217,7 +23217,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -23721,7 +23721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24288,7 +24288,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24302,7 +24302,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24446,7 +24446,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24460,7 +24460,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24721,7 +24721,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24735,7 +24735,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24749,7 +24749,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -24893,7 +24893,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -25019,7 +25019,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -25154,7 +25154,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -25451,7 +25451,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -25532,7 +25532,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -25649,7 +25649,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28601,7 +28601,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -28718,7 +28718,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28732,7 +28732,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -28822,7 +28822,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -28948,7 +28948,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -29164,7 +29164,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", @@ -29326,7 +29326,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -29407,7 +29407,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -29488,7 +29488,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30343,7 +30343,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30357,7 +30357,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30371,7 +30371,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30385,7 +30385,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30466,7 +30466,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30619,7 +30619,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30727,7 +30727,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -30887,7 +30887,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "5-undetected", @@ -30956,7 +30956,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30970,7 +30970,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30984,7 +30984,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -30998,7 +30998,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -31088,7 +31088,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -31259,7 +31259,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185105,7 +185105,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185174,7 +185174,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -185264,7 +185264,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185278,7 +185278,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185292,7 +185292,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -185409,7 +185409,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -185661,7 +185661,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -185730,7 +185730,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185811,7 +185811,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -185928,7 +185928,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -185997,7 +185997,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -186087,7 +186087,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186186,7 +186186,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186200,7 +186200,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186214,7 +186214,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -186322,7 +186322,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -186403,7 +186403,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -186502,7 +186502,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -186664,7 +186664,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187240,7 +187240,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187254,7 +187254,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187268,7 +187268,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -187403,7 +187403,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187484,7 +187484,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187565,7 +187565,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -187727,7 +187727,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -187808,7 +187808,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -188906,7 +188906,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189023,7 +189023,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189176,7 +189176,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -189293,7 +189293,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189392,7 +189392,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189406,7 +189406,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189532,7 +189532,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189676,7 +189676,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -189793,7 +189793,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -189883,7 +189883,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -190639,7 +190639,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -190882,7 +190882,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193573,7 +193573,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -193654,7 +193654,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193668,7 +193668,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -193812,7 +193812,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -194019,7 +194019,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -194088,7 +194088,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 3, "match_coverage": 100.0, "matcher": "5-undetected", @@ -194157,7 +194157,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -194247,7 +194247,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194328,7 +194328,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194409,7 +194409,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194490,7 +194490,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -194589,7 +194589,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -194715,7 +194715,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -194841,7 +194841,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -194855,7 +194855,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -194869,7 +194869,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195292,7 +195292,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -195580,7 +195580,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -195661,7 +195661,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -195832,7 +195832,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195846,7 +195846,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -195963,7 +195963,7 @@ "score": 99.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "1-hash", @@ -196053,7 +196053,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -197061,7 +197061,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -197151,7 +197151,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -197241,7 +197241,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197255,7 +197255,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197269,7 +197269,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 1, "match_coverage": 100.0, "matcher": "2-aho", @@ -197283,7 +197283,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "rootfs/var/lib/rpm/Packages", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json index f60cd5c7483..19cdcbc2eff 100644 --- a/tests/scancode/data/composer/composer.expected.json +++ b/tests/scancode/data/composer/composer.expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "composer.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 8ebe3ce5964..de534595ecb 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 @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm", "matched_length": 2, "match_coverage": 100.0, "matcher": "5-undetected", diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json index 9bfba3ea73a..f1625223ec7 100644 --- a/tests/summarycode/data/classify/with_package_data.expected.json +++ b/tests/summarycode/data/classify/with_package_data.expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -48,7 +48,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", 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 9a845eadfad..47c50fc2fd6 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json @@ -80,7 +80,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "component-package-build/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json index 0b7e5b7f2b0..facb950aafe 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "component-package/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 0e193aaa413..ff38d4c2f89 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 @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package-files-not-counted-in-license-holders/package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json index b75f8ef82b3..02d56f52544 100644 --- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json index e987835c4b8..316438f8b58 100644 --- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json @@ -34,7 +34,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "package-manifest/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json index d86d7a044d5..a2a6ca2cfd4 100644 --- a/tests/summarycode/data/score/basic-expected.json +++ b/tests/summarycode/data/score/basic-expected.json @@ -54,7 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "basic/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json index 23f2a0ed115..a38530c2a3f 100644 --- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json +++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json @@ -54,7 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "inconsistent_licenses_copyleft/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json index f8e0119d8f5..4ccfa315c31 100644 --- a/tests/summarycode/data/score/jar-expected.json +++ b/tests/summarycode/data/score/jar-expected.json @@ -46,7 +46,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 5, "match_coverage": 100.0, "matcher": "2-aho", @@ -60,7 +60,7 @@ "score": 100.0, "start_line": 2, "end_line": 2, - "from_file": null, + "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "matched_length": 9, "match_coverage": 100.0, "matcher": "2-aho", diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json index 3779d255e45..f551ac0695d 100644 --- a/tests/summarycode/data/score/no_license_ambiguity-expected.json +++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json @@ -61,7 +61,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "no_license_ambiguity/Cargo.toml", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json index 8e9fe23af3e..f3bf69da22b 100644 --- a/tests/summarycode/data/score/no_license_text-expected.json +++ b/tests/summarycode/data/score/no_license_text-expected.json @@ -54,7 +54,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "no_license_text/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 6bf1b1239f1..9b9a44ad671 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 @@ -77,7 +77,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "codebase/cargo.toml", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -152,7 +152,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "codebase/setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 d88b645cd4a..039b6d6221b 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 @@ -69,7 +69,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -89,7 +89,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "pip-22.0.4/PKG-INFO", "matched_length": 5, "match_coverage": 100.0, "matcher": "1-hash", 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 bf81675c722..970a6a633ca 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 @@ -69,7 +69,7 @@ "score": 100.0, "start_line": 4, "end_line": 14, - "from_file": null, + "from_file": "codebase/setup.py", "matched_length": 85, "match_coverage": 100.0, "matcher": "2-aho", 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 7bdcda82f75..ab4f946abcf 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 @@ -73,7 +73,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "codebase/setup.py", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json index 938ad6881fb..b531d8553b2 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json @@ -2217,7 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 bf297b84414..5d100e63f2f 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 @@ -2217,7 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", 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 26c299034f7..70f2fd13b5b 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json @@ -2217,7 +2217,7 @@ "score": 50.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/package.json", "matched_length": 3, "match_coverage": 100.0, "matcher": "1-hash", diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json index 7a51fa53877..966f1c4b571 100644 --- a/tests/summarycode/data/tallies/packages/expected.json +++ b/tests/summarycode/data/tallies/packages/expected.json @@ -34,7 +34,7 @@ "score": 70.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", @@ -116,7 +116,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-hash", @@ -191,7 +191,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "scan/scoped1/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", 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 7f4d3774bc5..e165c57a400 100644 --- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json +++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json @@ -42,7 +42,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 1, "match_coverage": 100.0, "matcher": "1-spdx-id", @@ -62,7 +62,7 @@ "score": 100.0, "start_line": 1, "end_line": 1, - "from_file": null, + "from_file": "base64-arraybuffer-0.1.4/package.json", "matched_length": 2, "match_coverage": 100.0, "matcher": "2-aho", From a1fc5d8becedbb6f93029d4e7deb68823df54a2c Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 7 Dec 2023 19:41:47 +0530 Subject: [PATCH 03/11] Add new `sample_matches` attribute to top-level detection Signed-off-by: Ayan Sinha Mahapatra --- src/licensedcode/detection.py | 8 +- .../filtered-expected.json | 18 +- .../filtered-expected2.json | 18 +- .../filtered-expected3.json | 18 +- .../data/common/manifests-expected.json | 208 ++++++- .../data/common/manifests-expected.jsonlines | 208 ++++++- .../data/common/manifests-expected.yaml | 174 ++++++ .../yaml/package-and-licenses-expected.yaml | 233 +++++++ ...tional_license_combined_test.expected.json | 74 ++- ...ional_license_directory_test.expected.json | 32 +- ...ditional_license_plugin_test.expected.json | 18 +- ...e-reference-works-with-clues.expected.json | 402 ++++++++++++- ...-matched-text-with-reference.expected.json | 68 ++- .../scan-with-reference.expected.json | 68 ++- .../data/match_spdx/scan-expected.json | 18 +- .../unknown-license-expected.json | 18 +- .../unknown-license-text-expected.json | 16 + .../clues/woodstox.expected.json | 36 +- .../license-expression/scan.expected.json | 36 +- .../spdx-expressions.expected.json | 32 +- .../license-ref-see-copying.expected.json | 48 +- .../license_reference/scan-ref.expected.json | 48 +- ...-unknown-reference-copyright.expected.json | 78 ++- .../license_reference/scan-wref.expected.json | 18 +- ...unknown-ref-to-key-file-root.expected.json | 174 +++++- .../license_url/license_url.expected.json | 18 +- .../package/package.expected.json | 36 +- .../scan/e2fsprogs-expected.json | 18 +- .../scan/ffmpeg-license.expected.json | 172 +++++- .../sqlite/sqlite.expected.json | 18 +- .../text/scan-diag.expected.json | 36 +- .../plugin_license/text/scan.expected.json | 36 +- .../text_long_lines/scan-diag.expected.json | 36 +- .../text_long_lines/scan.expected.json | 36 +- ...n-unknown-intro-dual-license.expected.json | 58 ++ ...tro-eclipse-foundation-tycho.expected.json | 194 +++++- ...own-intro-eclipse-foundation.expected.json | 32 +- ...nown-intro-long-gaps-between.expected.json | 60 ++ ...intro-with-imperfect-matches.expected.json | 58 ++ .../file_with_multiple_licenses.expected.json | 32 +- .../policy-codebase.expected.json | 90 ++- .../plugin_license_text/scan.expected.json | 72 ++- .../many-podspecs-with-license-expected.json | 54 +- ...cted-with-test-manifests-with-license.json | 68 ++- ...ackage-instance-with-license-expected.json | 96 ++- .../activemq-camel.expected.json | 16 + .../google-built-collection.expected.json | 18 +- .../jquery-form-3.51.0.expected.json | 158 ++++- .../fizzler.expected.json | 120 +++- .../flutter_playtabs_bridge.expected.json | 76 ++- .../nanopb.expected.json | 48 +- .../reference-to-package/base.expected.json | 48 +- .../fusiondirectory.expected.json | 568 +++++++++++++++++- .../google_appengine_sdk.expected.json | 114 +++- .../paddlenlp.expected.json | 214 ++++++- .../physics.expected.json | 296 ++++++++- .../reference-to-package/samba.expected.json | 420 ++++++++++++- ...ackson-dataformat-xml-2.13.5-expected.json | 48 +- .../johnzon-jsonb-1.2.11-expected.json | 106 +++- .../assemble/numbers-1.7.4-expected.json | 36 +- ...htrace-core-4.0.0-incubating-expected.json | 114 +++- ....4-pypi-package-with-license-expected.json | 182 +++++- tests/scancode/data/info/all.expected.json | 36 +- .../data/info/all.rooted.expected.json | 36 +- .../scancode/data/license_text/test.expected | 18 +- .../plugin_only_findings/basic.expected.json | 36 +- .../component-package-build-expected.json | 72 ++- .../component-package-expected.json | 72 ++- .../license-holder-rollup-expected.json | 64 +- ...iple-same-holder-and-license-expected.json | 32 +- ...t-counted-in-license-holders-expected.json | 36 +- .../package-fileset-expected.json | 36 +- .../package-manifest-expected.json | 36 +- ...rectory-with-minority-origin-expected.json | 18 +- ...return-nested-local-majority-expected.json | 64 +- .../data/score/basic-expected.json | 54 +- ...consistent_licenses_copyleft-expected.json | 72 ++- .../summarycode/data/score/jar-expected.json | 86 ++- .../score/no_license_ambiguity-expected.json | 150 ++++- .../data/score/no_license_text-expected.json | 36 +- ...nflicting_license_categories.expected.json | 114 +++- .../summary/end-2-end/bug-1141.expected.json | 36 +- .../holders/clear_holder.expected.json | 68 ++- .../holders/combined_holders.expected.json | 68 ++- .../license_ambiguity/ambiguous.expected.json | 36 +- .../unambiguous.expected.json | 68 ++- .../multiple_package_data.expected.json | 140 ++++- .../single_file/single_file.expected.json | 18 +- .../summary-without-holder-pypi.expected.json | 182 +++++- ...holder_from_package_resource.expected.json | 18 +- .../with_package_data.expected.json | 104 +++- .../without_package_data.expected.json | 68 ++- .../tallies/end-2-end/bug-1141.expected.json | 36 +- .../full_tallies/tallies.expected.json | 230 ++++++- .../tallies_by_facet.expected.json | 230 ++++++- .../tallies_details.expected.json | 230 ++++++- ...lies_key_files-details.expected.json-lines | 212 ++++++- .../tallies_key_files.expected.json | 212 ++++++- .../no_todo/base64-arraybuffer.expected.json | 104 +++- .../unknown-license-expected-diag.json | 16 + .../unknown-license-expected.json | 18 +- 101 files changed, 8717 insertions(+), 316 deletions(-) diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py index b0416f4592e..96abdc49967 100644 --- a/src/licensedcode/detection.py +++ b/src/licensedcode/detection.py @@ -670,6 +670,7 @@ def to_dict( if include_text: result['matched_text'] = matched_text + return result @@ -917,7 +918,12 @@ def dict_fields(attr, value): return True - return attr.asdict(self, filter=dict_fields) + detection_mapping = attr.asdict(self, filter=dict_fields) + detection_mapping["sample_matches"] = [ + match.to_dict(include_text=True) + for match in self.matches + ] + return detection_mapping def get_license_detection_object(self): return LicenseDetection( diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json index 7bc72657f32..e2c3cc214f5 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json @@ -3,7 +3,23 @@ { "identifier": "apache_1_1-1712efcb-d696-b5e4-214d-b2ab69680c2a", "license_expression": "apache-1.1", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 96.07, + "from_file": "LICENSE", + "start_line": 7, + "end_line": 70, + "matched_length": 367, + "match_coverage": 100.0, + "matcher": "3-seq", + "license_expression": "apache-1.1", + "rule_identifier": "apache-1.1_63.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE", + "matched_text": null + } + ] } ], "files": [ diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json index d7cb041614a..61ae35898ea 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json @@ -3,7 +3,23 @@ { "identifier": "pygres_2_2-04f085e8-3db1-f9e2-8dde-7ba8a7ba619a", "license_expression": "pygres-2.2", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "LICENSE2", + "start_line": 7, + "end_line": 22, + "matched_length": 145, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "pygres-2.2", + "rule_identifier": "pygres-2.2_2.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE", + "matched_text": null + } + ] } ], "files": [ diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json index 30dcc9f173d..508a3452189 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json @@ -3,7 +3,23 @@ { "identifier": "pcre-c61d8210-7748-d787-5e3e-fd64c6cd6b6a", "license_expression": "pcre", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "LICENSE3", + "start_line": 1, + "end_line": 47, + "matched_length": 303, + "match_coverage": 100.0, + "matcher": "1-hash", + "license_expression": "pcre", + "rule_identifier": "pcre.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE", + "matched_text": null + } + ] } ], "files": [ diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json index db58308da5a..85d3913d23c 100644 --- a/tests/formattedcode/data/common/manifests-expected.json +++ b/tests/formattedcode/data/common/manifests-expected.json @@ -472,52 +472,240 @@ { "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8", "license_expression": "apache-2.0", - "detection_count": 3 + "detection_count": 3, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-mapping/package.json", + "start_line": 20, + "end_line": 20, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE", + "matched_text": null + } + ] }, { "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0", "license_expression": "apache-2.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-mapping/package.json", + "start_line": 6, + "end_line": 6, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_65.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE", + "matched_text": null + } + ] }, { "identifier": "cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6", "license_expression": "cddl-1.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 16.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 17, + "end_line": 19, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_72.RULE", + "rule_relevance": 16, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE", + "matched_text": null + }, + { + "score": 82.35, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 18, + "end_line": 20, + "matched_length": 14, + "match_coverage": 82.35, + "matcher": "3-seq", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0_32.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE", + "matched_text": null + } + ] }, { "identifier": "cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880", "license_expression": "cddl-1.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 1, + "end_line": 1, + "matched_length": 8, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0.RULE", + "rule_relevance": 100, + "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" + }, + { + "score": 100.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 2, + "end_line": 2, + "matched_length": 7, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0_4.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE", + "matched_text": " url: http://www.sun.com/cddl/cddl.html" + } + ] }, { "identifier": "lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321", "license_expression": "lgpl-3.0", - "detection_count": 2 + "detection_count": 2, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 74, + "end_line": 75, + "matched_length": 10, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 9, + "end_line": 20, + "matched_length": 106, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_276.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 65, + "end_line": 65, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_152.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 1, + "end_line": 1, + "matched_length": 1, + "match_coverage": 100.0, + "matcher": "1-hash", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_29.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE", + "matched_text": "LGPLv3" + } + ] }, { "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee", "license_expression": "mit", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-string/package.json", + "start_line": 4, + "end_line": 4, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "mit", + "rule_identifier": "mit_30.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE", + "matched_text": null + } + ] }, { "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf", "license_expression": "mit", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-string/package.json", + "start_line": 1, + "end_line": 1, + "matched_length": 1, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "mit", + "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "MIT" + } + ] } ], "files": [ diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines index 41b80c9de38..70cdc5629d3 100644 --- a/tests/formattedcode/data/common/manifests-expected.jsonlines +++ b/tests/formattedcode/data/common/manifests-expected.jsonlines @@ -508,52 +508,240 @@ { "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8", "license_expression": "apache-2.0", - "detection_count": 3 + "detection_count": 3, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-mapping/package.json", + "start_line": 20, + "end_line": 20, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE", + "matched_text": null + } + ] }, { "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0", "license_expression": "apache-2.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-mapping/package.json", + "start_line": 6, + "end_line": 6, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_65.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE", + "matched_text": null + } + ] }, { "identifier": "cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6", "license_expression": "cddl-1.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 16.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 17, + "end_line": 19, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_72.RULE", + "rule_relevance": 16, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE", + "matched_text": null + }, + { + "score": 82.35, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 18, + "end_line": 20, + "matched_length": 14, + "match_coverage": 82.35, + "matcher": "3-seq", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0_32.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE", + "matched_text": null + } + ] }, { "identifier": "cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880", "license_expression": "cddl-1.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 1, + "end_line": 1, + "matched_length": 8, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0.RULE", + "rule_relevance": 100, + "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" + }, + { + "score": 100.0, + "from_file": "manifests/maven/persistence-api-1.0.pom", + "start_line": 2, + "end_line": 2, + "matched_length": 7, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "cddl-1.0", + "rule_identifier": "cddl-1.0_4.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE", + "matched_text": " url: http://www.sun.com/cddl/cddl.html" + } + ] }, { "identifier": "lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321", "license_expression": "lgpl-3.0", - "detection_count": 2 + "detection_count": 2, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 74, + "end_line": 75, + "matched_length": 10, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 9, + "end_line": 20, + "matched_length": 106, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_276.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 65, + "end_line": 65, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_152.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE", + "matched_text": null + } + ] }, { "identifier": "lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5", "license_expression": "lgpl-3.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/pypi/bluepyopt_setup.py", + "start_line": 1, + "end_line": 1, + "matched_length": 1, + "match_coverage": 100.0, + "matcher": "1-hash", + "license_expression": "lgpl-3.0", + "rule_identifier": "lgpl-3.0_29.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE", + "matched_text": "LGPLv3" + } + ] }, { "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee", "license_expression": "mit", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-string/package.json", + "start_line": 4, + "end_line": 4, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "mit", + "rule_identifier": "mit_30.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE", + "matched_text": null + } + ] }, { "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf", "license_expression": "mit", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "manifests/npm-license-string/package.json", + "start_line": 1, + "end_line": 1, + "matched_length": 1, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "mit", + "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "MIT" + } + ] } ] }, diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml index fa5639c179f..ebf82f29f33 100644 --- a/tests/formattedcode/data/common/manifests-expected.yaml +++ b/tests/formattedcode/data/common/manifests-expected.yaml @@ -466,33 +466,207 @@ license_detections: - identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8 license_expression: apache-2.0 detection_count: 3 + sample_matches: + - score: '100.0' + from_file: manifests/npm-license-mapping/package.json + start_line: 20 + end_line: 20 + matched_length: 3 + match_coverage: '100.0' + matcher: 2-aho + license_expression: apache-2.0 + rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE + matched_text: ' "type": "Apache 2.0",' - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0 license_expression: apache-2.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/npm-license-mapping/package.json + start_line: 6 + end_line: 6 + matched_length: 4 + match_coverage: '100.0' + matcher: 2-aho + license_expression: apache-2.0 + rule_identifier: apache-2.0_65.RULE + rule_relevance: 100 + 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",' - identifier: cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6 license_expression: cddl-1.0 detection_count: 1 + sample_matches: + - score: '16.0' + from_file: manifests/maven/persistence-api-1.0.pom + start_line: 17 + end_line: '19' + matched_length: 3 + match_coverage: '100.0' + matcher: 2-aho + license_expression: unknown-license-reference + rule_identifier: license-intro_72.RULE + rule_relevance: 16 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE + matched_text: | + + + Common Development and Distribution License (CDDL) v1.0 + - score: '82.35' + from_file: manifests/maven/persistence-api-1.0.pom + start_line: 18 + end_line: 20 + matched_length: 14 + match_coverage: '82.35' + matcher: 3-seq + license_expression: cddl-1.0 + rule_identifier: cddl-1.0_32.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE + matched_text: | + + Common Development and Distribution License (CDDL) v1.0 + http://www.sun.com/cddl/cddl.html - identifier: cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880 license_expression: cddl-1.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/maven/persistence-api-1.0.pom + start_line: 1 + end_line: 1 + matched_length: 8 + match_coverage: '100.0' + matcher: 2-aho + license_expression: cddl-1.0 + rule_identifier: cddl-1.0.RULE + rule_relevance: 100 + 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' + - score: '100.0' + from_file: manifests/maven/persistence-api-1.0.pom + start_line: 2 + end_line: 2 + matched_length: 7 + match_coverage: '100.0' + matcher: 2-aho + license_expression: cddl-1.0 + rule_identifier: cddl-1.0_4.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE + matched_text: ' url: http://www.sun.com/cddl/cddl.html' - identifier: lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321 license_expression: lgpl-3.0 detection_count: 2 + sample_matches: + - score: '100.0' + from_file: manifests/pypi/bluepyopt_setup.py + start_line: 74 + end_line: 75 + matched_length: 10 + match_coverage: '100.0' + matcher: 2-aho + license_expression: lgpl-3.0 + rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE + matched_text: | + 'License :: OSI Approved :: GNU Lesser General Public ' + 'License v3 (LGPLv3)', - identifier: lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0 license_expression: lgpl-3.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/pypi/bluepyopt_setup.py + start_line: 9 + end_line: 20 + matched_length: 106 + match_coverage: '100.0' + matcher: 2-aho + license_expression: lgpl-3.0 + rule_identifier: lgpl-3.0_276.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE + matched_text: | + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License version 3.0 as published + by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - identifier: lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631 license_expression: lgpl-3.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/pypi/bluepyopt_setup.py + start_line: 65 + end_line: 65 + matched_length: 2 + match_coverage: '100.0' + matcher: 2-aho + license_expression: lgpl-3.0 + rule_identifier: lgpl-3.0_152.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE + matched_text: ' license="LGPLv3",' - identifier: lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5 license_expression: lgpl-3.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/pypi/bluepyopt_setup.py + start_line: 1 + end_line: 1 + matched_length: 1 + match_coverage: '100.0' + matcher: 1-hash + license_expression: lgpl-3.0 + rule_identifier: lgpl-3.0_29.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE + matched_text: LGPLv3 - identifier: mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee license_expression: mit detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/npm-license-string/package.json + start_line: 4 + end_line: 4 + matched_length: 2 + match_coverage: '100.0' + matcher: 2-aho + license_expression: mit + rule_identifier: mit_30.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE + matched_text: ' "license": "MIT",' - identifier: mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf license_expression: mit detection_count: 1 + sample_matches: + - score: '100.0' + from_file: manifests/npm-license-string/package.json + start_line: 1 + end_line: 1 + matched_length: 1 + match_coverage: '100.0' + matcher: 1-spdx-id + license_expression: mit + rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06 + rule_relevance: 100 + rule_url: + matched_text: MIT license_references: - key: apache-2.0 language: en diff --git a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml index 408814a51b0..3d99d8fab81 100644 --- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml +++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml @@ -123,18 +123,251 @@ license_detections: - identifier: apache_2_0-ab23f79b-ec38-9a8a-9b23-85059407f34d license_expression: apache-2.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: package-and-licenses/apache-2.0.LICENSE + start_line: 2 + end_line: 202 + matched_length: 1584 + match_coverage: '100.0' + matcher: 1-hash + license_expression: apache-2.0 + rule_identifier: apache-2.0.LICENSE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE + matched_text: " Apache License\n \ + \ Version 2.0, January 2004\n http://www.apache.org/licenses/\n\ + \ \n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n \n 1. Definitions.\n\ + \ \n \"License\" shall mean the terms and conditions for use, reproduction,\n\ + \ and distribution as defined by Sections 1 through 9 of this document.\n \n\ + \ \"Licensor\" shall mean the copyright owner or entity authorized by\n \ + \ the copyright owner that is granting the License.\n \n \"Legal Entity\" shall\ + \ mean the union of the acting entity and all\n other entities that control,\ + \ are controlled by, or are under common\n control with that entity. For the\ + \ purposes of this definition,\n \"control\" means (i) the power, direct or indirect,\ + \ to cause the\n direction or management of such entity, whether by contract\ + \ or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n \ + \ outstanding shares, or (iii) beneficial ownership of such entity.\n \n \ + \ \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising\ + \ permissions granted by this License.\n \n \"Source\" form shall mean the preferred\ + \ form for making modifications,\n including but not limited to software source\ + \ code, documentation\n source, and configuration files.\n \n \"Object\"\ + \ form shall mean any form resulting from mechanical\n transformation or translation\ + \ of a Source form, including but\n not limited to compiled object code, generated\ + \ documentation,\n and conversions to other media types.\n \n \"Work\" shall\ + \ mean the work of authorship, whether in Source or\n Object form, made available\ + \ under the License, as indicated by a\n copyright notice that is included in\ + \ or attached to the work\n (an example is provided in the Appendix below).\n\ + \ \n \"Derivative Works\" shall mean any work, whether in Source or Object\n\ + \ form, that is based on (or derived from) the Work and for which the\n \ + \ editorial revisions, annotations, elaborations, or other modifications\n represent,\ + \ as a whole, an original work of authorship. For the purposes\n of this License,\ + \ Derivative Works shall not include works that remain\n separable from, or merely\ + \ link (or bind by name) to the interfaces of,\n the Work and Derivative Works\ + \ thereof.\n \n \"Contribution\" shall mean any work of authorship, including\n\ + \ the original version of the Work and any modifications or additions\n \ + \ to that Work or Derivative Works thereof, that is intentionally\n submitted\ + \ to Licensor for inclusion in the Work by the copyright owner\n or by an individual\ + \ or Legal Entity authorized to submit on behalf of\n the copyright owner. For\ + \ the purposes of this definition, \"submitted\"\n means any form of electronic,\ + \ verbal, or written communication sent\n to the Licensor or its representatives,\ + \ including but not limited to\n communication on electronic mailing lists, source\ + \ code control systems,\n and issue tracking systems that are managed by, or\ + \ on behalf of, the\n Licensor for the purpose of discussing and improving the\ + \ Work, but\n excluding communication that is conspicuously marked or otherwise\n\ + \ designated in writing by the copyright owner as \"Not a Contribution.\"\n \n\ + \ \"Contributor\" shall mean Licensor and any individual or Legal Entity\n \ + \ on behalf of whom a Contribution has been received by Licensor and\n subsequently\ + \ incorporated within the Work.\n \n 2. Grant of Copyright License. Subject to the\ + \ terms and conditions of\n this License, each Contributor hereby grants to You\ + \ a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ + \ copyright license to reproduce, prepare Derivative Works of,\n publicly\ + \ display, publicly perform, sublicense, and distribute the\n Work and such Derivative\ + \ Works in Source or Object form.\n \n 3. Grant of Patent License. Subject to the\ + \ terms and conditions of\n this License, each Contributor hereby grants to You\ + \ a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ + \ (except as stated in this section) patent license to make, have made,\n \ + \ use, offer to sell, sell, import, and otherwise transfer the Work,\n where\ + \ such license applies only to those patent claims licensable\n by such Contributor\ + \ that are necessarily infringed by their\n Contribution(s) alone or by combination\ + \ of their Contribution(s)\n with the Work to which such Contribution(s) was\ + \ submitted. If You\n institute patent litigation against any entity (including\ + \ a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n \ + \ or a Contribution incorporated within the Work constitutes direct\n or contributory\ + \ patent infringement, then any patent licenses\n granted to You under this License\ + \ for that Work shall terminate\n as of the date such litigation is filed.\n\ + \ \n 4. Redistribution. You may reproduce and distribute copies of the\n Work\ + \ or Derivative Works thereof in any medium, with or without\n modifications,\ + \ and in Source or Object form, provided that You\n meet the following conditions:\n\ + \ \n (a) You must give any other recipients of the Work or\n Derivative\ + \ Works a copy of this License; and\n \n (b) You must cause any modified files\ + \ to carry prominent notices\n stating that You changed the files; and\n\ + \ \n (c) You must retain, in the Source form of any Derivative Works\n \ + \ that You distribute, all copyright, patent, trademark, and\n attribution\ + \ notices from the Source form of the Work,\n excluding those notices that\ + \ do not pertain to any part of\n the Derivative Works; and\n \n (d)\ + \ If the Work includes a \"NOTICE\" text file as part of its\n distribution,\ + \ then any Derivative Works that You distribute must\n include a readable\ + \ copy of the attribution notices contained\n within such NOTICE file, excluding\ + \ those notices that do not\n pertain to any part of the Derivative Works,\ + \ in at least one\n of the following places: within a NOTICE text file distributed\n\ + \ as part of the Derivative Works; within the Source form or\n documentation,\ + \ if provided along with the Derivative Works; or,\n within a display generated\ + \ by the Derivative Works, if and\n wherever such third-party notices normally\ + \ appear. The contents\n of the NOTICE file are for informational purposes\ + \ only and\n do not modify the License. You may add Your own attribution\n\ + \ notices within Derivative Works that You distribute, alongside\n \ + \ or as an addendum to the NOTICE text from the Work, provided\n that\ + \ such additional attribution notices cannot be construed\n as modifying\ + \ the License.\n \n You may add Your own copyright statement to Your modifications\ + \ and\n may provide additional or different license terms and conditions\n \ + \ for use, reproduction, or distribution of Your modifications, or\n for any\ + \ such Derivative Works as a whole, provided Your use,\n reproduction, and distribution\ + \ of the Work otherwise complies with\n the conditions stated in this License.\n\ + \ \n 5. Submission of Contributions. Unless You explicitly state otherwise,\n \ + \ any Contribution intentionally submitted for inclusion in the Work\n by\ + \ You to the Licensor shall be under the terms and conditions of\n this License,\ + \ without any additional terms or conditions.\n Notwithstanding the above, nothing\ + \ herein shall supersede or modify\n the terms of any separate license agreement\ + \ you may have executed\n with Licensor regarding such Contributions.\n \n \ + \ 6. Trademarks. This License does not grant permission to use the trade\n names,\ + \ trademarks, service marks, or product names of the Licensor,\n except as required\ + \ for reasonable and customary use in describing the\n origin of the Work and\ + \ reproducing the content of the NOTICE file.\n \n 7. Disclaimer of Warranty. Unless\ + \ required by applicable law or\n agreed to in writing, Licensor provides the\ + \ Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n\ + \ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied,\ + \ including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT,\ + \ MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible\ + \ for determining the\n appropriateness of using or redistributing the Work and\ + \ assume any\n risks associated with Your exercise of permissions under this\ + \ License.\n \n 8. Limitation of Liability. In no event and under no legal theory,\n\ + \ whether in tort (including negligence), contract, or otherwise,\n unless\ + \ required by applicable law (such as deliberate and grossly\n negligent acts)\ + \ or agreed to in writing, shall any Contributor be\n liable to You for damages,\ + \ including any direct, indirect, special,\n incidental, or consequential damages\ + \ of any character arising as a\n result of this License or out of the use or\ + \ inability to use the\n Work (including but not limited to damages for loss\ + \ of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n\ + \ other commercial damages or losses), even if such Contributor\n has been\ + \ advised of the possibility of such damages.\n \n 9. Accepting Warranty or Additional\ + \ Liability. While redistributing\n the Work or Derivative Works thereof, You\ + \ may choose to offer,\n and charge a fee for, acceptance of support, warranty,\ + \ indemnity,\n or other liability obligations and/or rights consistent with this\n\ + \ License. However, in accepting such obligations, You may act only\n on\ + \ Your own behalf and on Your sole responsibility, not on behalf\n of any other\ + \ Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor\ + \ harmless for any liability\n incurred by, or claims asserted against, such\ + \ Contributor by reason\n of your accepting any such warranty or additional liability.\n\ + \ \n END OF TERMS AND CONDITIONS\n \n APPENDIX: How to apply the Apache License\ + \ to your work.\n \n To apply the Apache License to your work, attach the following\n\ + \ boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced\ + \ with your own identifying information. (Don't include\n the brackets!) The\ + \ text should be enclosed in the appropriate\n comment syntax for the file format.\ + \ We also recommend that a\n file or class name and description of purpose be\ + \ included on the\n same \"printed page\" as the copyright notice for easier\n\ + \ identification within third-party archives.\n \n Copyright [yyyy] [name of\ + \ copyright owner]\n \n Licensed under the Apache License, Version 2.0 (the \"License\"\ + );\n you may not use this file except in compliance with the License.\n You may\ + \ obtain a copy of the License at\n \n http://www.apache.org/licenses/LICENSE-2.0\n\ + \ \n Unless required by applicable law or agreed to in writing, software\n distributed\ + \ under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR\ + \ CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific\ + \ language governing permissions and\n limitations under the License." - identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8 license_expression: apache-2.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: package-and-licenses/setup.cfg + start_line: 1 + end_line: 1 + matched_length: 3 + match_coverage: '100.0' + matcher: 1-hash + license_expression: apache-2.0 + rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE + matched_text: Apache-2.0 - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0 license_expression: apache-2.0 detection_count: 1 + sample_matches: + - score: '100.0' + from_file: package-and-licenses/setup.cfg + start_line: 4 + end_line: 4 + matched_length: 4 + match_coverage: '100.0' + matcher: 2-aho + license_expression: apache-2.0 + rule_identifier: apache-2.0_65.RULE + rule_relevance: 100 + 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 - identifier: apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39 license_expression: apache-2.0 AND (apache-2.0 OR mit) detection_count: 1 + sample_matches: + - score: '80.0' + from_file: package-and-licenses/README.txt + start_line: 3 + end_line: 3 + matched_length: 4 + match_coverage: '100.0' + matcher: 2-aho + license_expression: apache-2.0 + rule_identifier: apache-2.0_73.RULE + rule_relevance: 80 + 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 + - score: '100.0' + from_file: package-and-licenses/README.txt + start_line: 3 + end_line: 3 + matched_length: 5 + match_coverage: '100.0' + matcher: 2-aho + license_expression: apache-2.0 OR mit + rule_identifier: apache-2.0_or_mit_36.RULE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE + matched_text: This is licensed under Apache-2.0 or MIT - identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a license_expression: mit detection_count: 1 + sample_matches: + - score: '100.0' + from_file: package-and-licenses/mit.LICENSE + start_line: 2 + end_line: '19' + matched_length: 161 + match_coverage: '100.0' + matcher: 1-hash + license_expression: mit + rule_identifier: mit.LICENSE + rule_relevance: 100 + rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE + matched_text: | + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. license_references: - key: apache-2.0 language: en 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 94cc30b044f..bffb2a81ae0 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 @@ -3,7 +3,79 @@ { "identifier": "example_installed_1_and_example_installed_2_and_example1_and_example2_and_apache_2_0-cfa2fe66-d37a-6bee-465f-3d11802e1c1d", "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "additional_license_combined_test.txt", + "start_line": 1, + "end_line": 1, + "matched_length": 11, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example-installed-1", + "rule_identifier": "example-installed-1.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + }, + { + "score": 100.0, + "from_file": "additional_license_combined_test.txt", + "start_line": 3, + "end_line": 3, + "matched_length": 12, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example-installed-2", + "rule_identifier": "example-installed-2.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + }, + { + "score": 100.0, + "from_file": "additional_license_combined_test.txt", + "start_line": 5, + "end_line": 5, + "matched_length": 9, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example1", + "rule_identifier": "example1.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + }, + { + "score": 100.0, + "from_file": "additional_license_combined_test.txt", + "start_line": 5, + "end_line": 9, + "matched_length": 69, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example2", + "rule_identifier": "example2.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + }, + { + "score": 100.0, + "from_file": "additional_license_combined_test.txt", + "start_line": 12, + "end_line": 12, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_65.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE", + "matched_text": null + } + ] } ], "license_references": [ 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 d094e94c092..1e4923eb95a 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 @@ -3,7 +3,37 @@ { "identifier": "example1_and_example2-f86ebb61-26dd-be05-2a61-01d7b630ba62", "license_expression": "example1 AND example2", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "additional_license_directory_test.txt", + "start_line": 1, + "end_line": 1, + "matched_length": 9, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example1", + "rule_identifier": "example1.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + }, + { + "score": 100.0, + "from_file": "additional_license_directory_test.txt", + "start_line": 1, + "end_line": 5, + "matched_length": 69, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "example2", + "rule_identifier": "example2.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + } + ] } ], "license_references": [ 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 2814039c2ad..341dd389d9e 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 @@ -3,7 +3,23 @@ { "identifier": "example_installed_1-ec26d04a-f591-6524-a28f-b2c6b6d5086a", "license_expression": "example-installed-1", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "additional_license_plugin_test.txt", + "start_line": 1, + "end_line": 1, + "matched_length": 11, + "match_coverage": 100.0, + "matcher": "1-hash", + "license_expression": "example-installed-1", + "rule_identifier": "example-installed-1.LICENSE", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + } + ] } ], "license_references": [ 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 cbc12559974..3fbca23dba4 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 @@ -4,13 +4,45 @@ "identifier": "bsd_new-35c287f1-5d41-52f8-399e-2391cd1b4b40", "license_expression": "bsd-new", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 397, + "end_line": 419, + "matched_length": 213, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "bsd-new", + "rule_identifier": "bsd-new_943.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE", + "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n * notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n * notice, this list of conditions and the following disclaimer in the\n * documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n * may be used to endorse or promote products derived from this software\n * without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE." + } + ] }, { "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98", "license_expression": "bsd-new", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 369, + "end_line": 391, + "matched_length": 213, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "bsd-new", + "rule_identifier": "bsd-new_19.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE", + "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n * notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n * notice, this list of conditions and the following disclaimer in the\n * documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n * may be used to endorse or promote products derived from this software\n * without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE." + } + ] }, { "identifier": "bzip2_libbzip_2010-7158bcb2-a4d7-9815-17d2-1b1d0a6d5de2", @@ -18,13 +50,59 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 274, + "end_line": 274, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_50.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE", + "matched_text": "is licensed under the following terms:" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 281, + "end_line": 310, + "matched_length": 233, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "bzip2-libbzip-2010", + "rule_identifier": "bzip2-libbzip-2010.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE", + "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n not claim that you wrote the original software. If you use this \n software in a product, an acknowledgment in the product \n documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n products derived from this software without specific prior written \n permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + } ] }, { "identifier": "openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621", "license_expression": "openssl", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 440, + "end_line": 487, + "matched_length": 332, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "openssl", + "rule_identifier": "openssl_1.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE", + "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n * notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n * notice, this list of conditions and the following disclaimer in\n * the documentation and/or other materials provided with the\n * distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n * software must display the following acknowledgment:\n * \"This product includes software developed by the OpenSSL Project\n * for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n * endorse or promote products derived from this software without\n * prior written permission. For written permission, please contact\n * openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n * nor may \"OpenSSL\" appear in their names without prior written\n * permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n * acknowledgment:\n * \"This product includes software developed by the OpenSSL Project\n * for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com). This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com)." + } + ] }, { "identifier": "openssl_ssleay-238ad05e-bfde-df4c-6b5b-61ef3ec16843", @@ -32,25 +110,229 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 422, + "end_line": 422, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_50.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE", + "matched_text": "is licensed under the following terms:" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 428, + "end_line": 432, + "matched_length": 56, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "openssl-ssleay", + "rule_identifier": "openssl-ssleay_43.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE", + "matched_text": "The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n the OpenSSL License and the original SSLeay license apply to the toolkit.\n See below for the actual license texts. Actually both licenses are BSD-style\n Open Source licenses. In case of any license issues related to OpenSSL\n please contact openssl-core@openssl.org." + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 434, + "end_line": 434, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "openssl-ssleay", + "rule_identifier": "openssl-ssleay_2.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE", + "matched_text": "OpenSSL License" + } ] }, { "identifier": "other_copyleft_and_gpl_1_0_plus-2a634b9a-02ad-d5b9-47fc-e91c5eb24808", "license_expression": "other-copyleft AND gpl-1.0-plus", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 80.0, + "from_file": "python.LICENSE", + "start_line": 62, + "end_line": 62, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "other-copyleft", + "rule_identifier": "other-copyleft_24.RULE", + "rule_relevance": 80, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE", + "matched_text": "GPL-compatible" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 62, + "end_line": 63, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "gpl-1.0-plus", + "rule_identifier": "gpl-1.0-plus_200.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_200.RULE", + "matched_text": "under\n the GPL." + }, + { + "score": 85.0, + "from_file": "python.LICENSE", + "start_line": 63, + "end_line": 63, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "gpl-1.0-plus", + "rule_identifier": "gpl-1.0-plus_351.RULE", + "rule_relevance": 85, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE", + "matched_text": "the GPL," + }, + { + "score": 85.0, + "from_file": "python.LICENSE", + "start_line": 64, + "end_line": 65, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "gpl-1.0-plus", + "rule_identifier": "gpl-1.0-plus_351.RULE", + "rule_relevance": 85, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE", + "matched_text": "The\n GPL-" + }, + { + "score": 80.0, + "from_file": "python.LICENSE", + "start_line": 65, + "end_line": 65, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "other-copyleft", + "rule_identifier": "other-copyleft_24.RULE", + "rule_relevance": 80, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE", + "matched_text": "GPL-compatible" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 66, + "end_line": 66, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "gpl-1.0-plus", + "rule_identifier": "gpl_194.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_194.RULE", + "matched_text": "released under the GPL;" + }, + { + "score": 80.0, + "from_file": "python.LICENSE", + "start_line": 68, + "end_line": 68, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "other-copyleft", + "rule_identifier": "other-copyleft_24.RULE", + "rule_relevance": 80, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE", + "matched_text": "GPL-compatible," + }, + { + "score": 85.0, + "from_file": "python.LICENSE", + "start_line": 71, + "end_line": 71, + "matched_length": 2, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "gpl-1.0-plus", + "rule_identifier": "gpl-1.0-plus_351.RULE", + "rule_relevance": 85, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE", + "matched_text": "the GPL." + } + ] }, { "identifier": "python-c496ccae-69a0-c5f8-a742-83bcd66bfe68", "license_expression": "python", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 23, + "end_line": 26, + "matched_length": 35, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "python", + "rule_identifier": "python_not_not-a-license_269.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_not_not-a-license_269.RULE", + "matched_text": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition). Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases." + } + ] }, { "identifier": "python_and_python_cwi-dda7296c-6bc9-a87c-6fcd-8aa47c3484dc", "license_expression": "python AND python-cwi", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 90.52, + "from_file": "python.LICENSE", + "start_line": 77, + "end_line": 255, + "matched_length": 1385, + "match_coverage": 90.52, + "matcher": "3-seq", + "license_expression": "python", + "rule_identifier": "python_2019.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_2019.RULE", + "matched_text": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n[2001], [2002], [2003], [2004], [2005], [2006], [2007], [2008] Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee. This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions. Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee. This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party. As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee. Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement. This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013. This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement. Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee. This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands. All rights reserved." + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 257, + "end_line": 272, + "matched_length": 145, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "python-cwi", + "rule_identifier": "python-cwi.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/python-cwi.LICENSE", + "matched_text": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE." + } + ] }, { "identifier": "sleepycat-a7cd8833-ecc2-8ade-54d7-392befcce801", @@ -58,13 +340,59 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 317, + "end_line": 317, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_50.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE", + "matched_text": "is licensed under the following terms:" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 334, + "end_line": 351, + "matched_length": 174, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "sleepycat", + "rule_identifier": "sleepycat_5.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_5.RULE", + "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n * notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n * notice, this list of conditions and the following disclaimer in the\n * documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n * how to obtain complete source code for the DB software and any\n * accompanying software that uses the DB software. The source code\n * must either be included in the distribution or be available for no\n * more than the cost of distribution plus a nominal fee, and must be\n * freely redistributable under reasonable conditions. For an\n * executable file, complete source code means the source code for all\n * modules it contains. It does not include source code for modules or\n * files that typically accompany the major components of the operating\n * system on which the executable file runs." + } ] }, { "identifier": "ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a", "license_expression": "ssleay-windows", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 497, + "end_line": 548, + "matched_length": 453, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "ssleay-windows", + "rule_identifier": "ssleay-windows.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE", + "matched_text": "This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to. The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code. The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n * notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n * notice, this list of conditions and the following disclaimer in the\n * documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n * must display the following acknowledgement:\n * \"This product includes cryptographic software written by\n * Eric Young (eay@cryptsoft.com)\"\n * The word 'cryptographic' can be left out if the rouines from the library\n * being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n * the apps directory (application code) you must include an acknowledgement:\n * \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed. i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]" + } + ] }, { "identifier": "tcl-75d8de8c-9cf0-d604-4b99-e03436ebfcd3", @@ -72,6 +400,36 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 595, + "end_line": 595, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_50.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE", + "matched_text": "is licensed under the following terms:" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 597, + "end_line": 635, + "matched_length": 341, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "tcl", + "rule_identifier": "tcl_14.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE", + "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties. The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license." + } ] }, { @@ -80,6 +438,36 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 552, + "end_line": 552, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "license-intro_50.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE", + "matched_text": "is licensed under the following terms:" + }, + { + "score": 100.0, + "from_file": "python.LICENSE", + "start_line": 554, + "end_line": 593, + "matched_length": 345, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "tcl", + "rule_identifier": "tcl.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tcl.LICENSE", + "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties. The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license." + } ] } ], 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 c33a5082eed..7de5abe8534 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 @@ -87,19 +87,81 @@ "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93", "license_expression": "apache-2.0 AND (mit OR bsd-simplified)", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/copyr.java", + "start_line": 3, + "end_line": 16, + "matched_length": 119, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_2.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE", + "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License." + }, + { + "score": 100.0, + "from_file": "scan/copyr.java", + "start_line": 19, + "end_line": 19, + "matched_length": 8, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "mit OR bsd-simplified", + "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause" + } + ] }, { "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732", "license_expression": "artistic-2.0", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/package.json", + "start_line": 28, + "end_line": 28, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "artistic-2.0", + "rule_identifier": "artistic-2.0_46.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE", + "matched_text": "license\": \"Artistic-2.0" + } + ] }, { "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370", "license_expression": "artistic-2.0 OR mit", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/package.json", + "start_line": 1, + "end_line": 1, + "matched_length": 5, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "artistic-2.0 OR mit", + "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "Artistic-2.0 OR MIT" + } + ] } ], "license_references": [ 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 d917b335753..75a817d8e2d 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 @@ -86,17 +86,79 @@ { "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93", "license_expression": "apache-2.0 AND (mit OR bsd-simplified)", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/copyr.java", + "start_line": 3, + "end_line": 16, + "matched_length": 119, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_2.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE", + "matched_text": null + }, + { + "score": 100.0, + "from_file": "scan/copyr.java", + "start_line": 19, + "end_line": 19, + "matched_length": 8, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "mit OR bsd-simplified", + "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b", + "rule_relevance": 100, + "rule_url": null, + "matched_text": null + } + ] }, { "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732", "license_expression": "artistic-2.0", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/package.json", + "start_line": 28, + "end_line": 28, + "matched_length": 4, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "artistic-2.0", + "rule_identifier": "artistic-2.0_46.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE", + "matched_text": null + } + ] }, { "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370", "license_expression": "artistic-2.0 OR mit", - "detection_count": 1 + "detection_count": 1, + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/package.json", + "start_line": 1, + "end_line": 1, + "matched_length": 5, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "artistic-2.0 OR mit", + "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "Artistic-2.0 OR MIT" + } + ] } ], "license_references": [ diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json index b865283e6f3..0eaac5a9958 100644 --- a/tests/licensedcode/data/match_spdx/scan-expected.json +++ b/tests/licensedcode/data/match_spdx/scan-expected.json @@ -4,7 +4,23 @@ "identifier": "mit-86af397f-7fb9-6751-2e09-217685ce5b2a", "license_expression": "mit", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "license", + "start_line": 240, + "end_line": 240, + "matched_length": 5, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "mit", + "rule_identifier": "spdx-license-identifier-mit-158ab4758b53eeb6113d49d57f1d2a094ce67b5b", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "licenses.nuget.org/MIT\">MIT * */ /*" + } + ] } ], "files": [ 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 3446170617b..b29c04006f4 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 @@ -4,13 +4,45 @@ "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0", "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", + "start_line": 1, + "end_line": 1, + "matched_length": 13, + "match_coverage": 100.0, + "matcher": "1-spdx-id", + "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", + "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7", + "rule_relevance": 100, + "rule_url": null, + "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */" + } + ] }, { "identifier": "unlicense-5cac2dde-ce1c-ad2c-181b-a2b96eff3bab", "license_expression": "unlicense", "detection_count": 1, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan/tocbot.js", + "start_line": 89, + "end_line": 89, + "matched_length": 198, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unlicense", + "rule_identifier": "unlicense.LICENSE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE", + "matched_text": "This is free and unencumbered software released into the public domain. * * Anyone is free to copy, modify, publish, use, compile, sell, or * distribute this software, either in source code form or as a compiled * binary, for any purpose, commercial or non-commercial, and by any * means. * * In jurisdictions that recognize copyright laws, the author or authors * of this software dedicate any and all copyright interest in the * software to the public domain. We make this dedication for the benefit * of the public at large and to the detriment of our heirs and * successors. We intend this dedication to be an overt act of * relinquishment in perpetuity of all present and future rights to this * software under copyright law. * * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. * * For more information, please refer to * */ /*" + } + ] } ], "files": [ 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 bb5cadd960e..314a513d83b 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 @@ -6,6 +6,64 @@ "detection_count": 1, "detection_log": [ "unknown-intro-followed-by-match" + ], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan-unknown-intro-dual-license/README.md", + "start_line": 43, + "end_line": 43, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "unknown-license-reference", + "rule_identifier": "lead-in_unknown_30.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE", + "matched_text": "dual-licensed under [`" + }, + { + "score": 50.0, + "from_file": "scan-unknown-intro-dual-license/README.md", + "start_line": 43, + "end_line": 43, + "matched_length": 1, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "wtfpl-2.0", + "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE", + "rule_relevance": 50, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE", + "matched_text": "WTFPL`](" + }, + { + "score": 100.0, + "from_file": "scan-unknown-intro-dual-license/README.md", + "start_line": 43, + "end_line": 43, + "matched_length": 3, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "wtfpl-2.0", + "rule_identifier": "wtfpl-2.0_27.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE", + "matched_text": "www.wtfpl.net/" + }, + { + "score": 100.0, + "from_file": "scan-unknown-intro-dual-license/README.md", + "start_line": 43, + "end_line": 43, + "matched_length": 6, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "mit", + "rule_identifier": "mit_64.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE", + "matched_text": "MIT`](https://opensource.org/licenses/MIT)." + } ] } ], 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 43fe1b8c8da..8aca7b9556f 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 @@ -4,61 +4,235 @@ "identifier": "apache_2_0-ec71f0b5-0d51-269d-4401-8cfe56a05bfe", "license_expression": "apache-2.0", "detection_count": 3, - "detection_log": [] + "detection_log": [], + "sample_matches": [ + { + "score": 100.0, + "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", + "start_line": 53, + "end_line": 54, + "matched_length": 51, + "match_coverage": 100.0, + "matcher": "2-aho", + "license_expression": "apache-2.0", + "rule_identifier": "apache-2.0_1208.RULE", + "rule_relevance": 100, + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE", + "matched_text": "code is subject to the terms and conditions of the Apache Software License 2.0. A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n

The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.\n

\nBSD License"
+        }
+      ]
     },
     {
       "identifier": "bsd_new-90d0d4b4-f98b-d4da-dbb0-7e601f6d404a",
       "license_expression": "bsd-new",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html",
+          "start_line": 64,
+          "end_line": 85,
+          "matched_length": 211,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_860.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_860.RULE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE."
+        }
+      ]
     },
     {
       "identifier": "cpl_1_0-08dc5398-457d-49be-a798-b57fe4d8de3e",
       "license_expression": "cpl-1.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html",
+          "start_line": 39,
+          "end_line": 41,
+          "matched_length": 60,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cpl-1.0",
+          "rule_identifier": "cpl-1.0_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_36.RULE",
+          "matched_text": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found herehttps://www.eclipse.org/legal/cpl-v10.html\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.org\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.orgLICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/\n\n
MIT License."
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/copyr.java",
+          "start_line": 18,
+          "end_line": 31,
+          "matched_length": 119,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
+          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 13,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+        }
+      ]
     },
     {
       "identifier": "ja_sig-025b96bc-0a83-9578-3e3f-0e0375a87457",
       "license_expression": "ja-sig",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/copyr.java",
+          "start_line": 4,
+          "end_line": 13,
+          "matched_length": 212,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "ja-sig",
+          "rule_identifier": "ja-sig.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
+        }
+      ]
     }
   ],
   "files": [
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 4a488e249fe..7c1c8aa12b6 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
@@ -569,17 +569,65 @@
     {
       "identifier": "apache_2_0-428c1364-ecb5-f806-7a2e-77d10737a7ce",
       "license_expression": "apache-2.0",
-      "detection_count": 6
+      "detection_count": 6,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "many-podspecs/Amplify.podspec",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_48.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
+          "matched_text": "Apache License, Version 2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-d310abb3-4d20-b3be-830d-ee37b30a997f",
       "license_expression": "apache-2.0",
-      "detection_count": 6
+      "detection_count": 6,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "many-podspecs/Amplify.podspec",
+          "start_line": 21,
+          "end_line": 21,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_68.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-08479bef-4de5-8be8-0987-1bec0c232b20",
       "license_expression": "apache-2.0",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "many-podspecs/amplify-ios.LICENSE",
+          "start_line": 2,
+          "end_line": 175,
+          "matched_length": 1405,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_70.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 99ab638eab1..488dd4487a2 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
@@ -93,17 +93,79 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
-      "detection_count": 4
+      "detection_count": 4,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pypi-with-test-manifests/PKG-INFO",
+          "start_line": 14,
+          "end_line": 14,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pypi-with-test-manifests/LICENSE",
+          "start_line": 3,
+          "end_line": 19,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-56f9dd7c-a466-cdf0-4fe0-6e57d31bc32a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pypi-with-test-manifests/PKG-INFO",
+          "start_line": 26,
+          "end_line": 26,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pypi-with-test-manifests/LICENSE",
+          "start_line": 3,
+          "end_line": 19,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 8ee2d1d1336..dafcb9f0c36 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
@@ -141,7 +141,23 @@
       "identifier": "bsd_new-261898a0-0118-87c4-7092-14e4ff134882",
       "license_expression": "bsd-new",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 99.0,
+          "from_file": "pypi/LICENSE.rst",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "bsd_new-68720980-08c9-ffb1-f28e-24c2e067385b",
@@ -149,6 +165,36 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pypi/setup.cfg",
+          "start_line": 13,
+          "end_line": 14,
+          "matched_length": 8,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_1302.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 99.0,
+          "from_file": "pypi/LICENSE.rst",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
+          "matched_text": null
+        }
       ]
     },
     {
@@ -157,13 +203,59 @@
       "detection_count": 1,
       "detection_log": [
         "package-unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pypi/setup.cfg",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 7,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_1305.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
+          "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
+        },
+        {
+          "score": 99.0,
+          "from_file": "pypi/LICENSE.rst",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
+          "matched_text": null
+        }
       ]
     },
     {
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 99.0,
+          "from_file": "pypi/setup.cfg",
+          "start_line": 25,
+          "end_line": 25,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 a36d714cd78..c8161b92298 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
@@ -236,6 +236,22 @@
       "detection_count": 2,
       "detection_log": [
         "from-package-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "activemq-camel/activemq-camel-pom.xml",
+          "start_line": 3,
+          "end_line": 16,
+          "matched_length": 119,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
+          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
+        }
       ]
     }
   ],
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 7c6e42c1a73..6fc148cfba4 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
@@ -118,7 +118,23 @@
       "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2",
       "license_expression": "bsd-new",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "google-built-collection/LICENSE",
+          "start_line": 3,
+          "end_line": 28,
+          "matched_length": 212,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_166.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+        }
+      ]
     }
   ],
   "files": [
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 9b3593a0606..0acb30fc8c8 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
@@ -455,49 +455,191 @@
       "identifier": "mit_or_gpl_2_0_plus__and_gpl_2_0-876682c2-38c1-1236-75ea-c46243d9c414",
       "license_expression": "(mit OR gpl-2.0-plus) AND gpl-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/composer.json",
+          "start_line": 21,
+          "end_line": 23,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit OR gpl-2.0-plus",
+          "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0-plus_1.RULE",
+          "matched_text": "license\": [\n    \"MIT\",\n    \"GPL-"
+        },
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/composer.json",
+          "start_line": 23,
+          "end_line": 23,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_52.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
+          "matched_text": "GPL-2.0\""
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus-473308ff-72ce-7e72-b3a9-5b1cc6680abb",
       "license_expression": "gpl-1.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "jquery-form-3.51.0/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_bare_word_only.RULE",
+          "rule_relevance": 50,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
+          "matched_text": "GPL"
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus-b6a20479-06f3-d753-878b-d3193c879108",
       "license_expression": "gpl-1.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_200.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
+          "matched_text": "http://malsup.github.com/gpl-license-v2.txt"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0-d7f02717-086e-f71b-962e-b18cc23b1827",
       "license_expression": "gpl-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/composer.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_52.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
+          "matched_text": "GPL-2.0"
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/composer.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-9967e727-165e-9bb5-f090-7de5e47a3929",
       "license_expression": "mit",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_14.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
+          "matched_text": "http://malsup.github.com/mit-license.txt"
+        }
+      ]
     },
     {
       "identifier": "mit_or_gpl_2_0-562fb174-abc9-da75-d29f-5bc4f1d9c56f",
       "license_expression": "mit OR gpl-2.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 94.81,
+          "from_file": "jquery-form-3.51.0/README.md",
+          "start_line": 12,
+          "end_line": 21,
+          "matched_length": 128,
+          "match_coverage": 94.81,
+          "matcher": "3-seq",
+          "license_expression": "mit OR gpl-2.0",
+          "rule_identifier": "mit_or_gpl-2.0_68.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
+          "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
+        }
+      ]
     },
     {
       "identifier": "mit_or_gpl_2_0-7f34a90b-f7b4-e345-2cc0-2de55fdcc1bd",
       "license_expression": "mit OR gpl-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jquery-form-3.51.0/package.json",
+          "start_line": 17,
+          "end_line": 22,
+          "matched_length": 21,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit OR gpl-2.0",
+          "rule_identifier": "mit_or_gpl-2.0_69.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_69.RULE",
+          "matched_text": "type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\""
+        }
+      ]
     }
   ],
   "files": [
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 9de3371e388..d005e7ada6e 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
@@ -150,13 +150,87 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 33.0,
+          "from_file": "fizzler/Fizzler.nuspec",
+          "start_line": 9,
+          "end_line": 9,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_382.RULE",
+          "rule_relevance": 33,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
+          "matched_text": "license type=\"file\">COPYING.txt"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.0-plus",
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_63.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+        }
       ]
     },
     {
       "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-2a11c930-7038-736e-5e48-b35f872691cc",
       "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.0-plus",
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_63.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
@@ -164,6 +238,50 @@
       "detection_count": 1,
       "detection_log": [
         "package-unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 16.0,
+          "from_file": "fizzler/Fizzler.nuspec",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_383.RULE",
+          "rule_relevance": 16,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
+          "matched_text": "license COPYING.txt"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.0-plus",
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fizzler/COPYING.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_63.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+        }
       ]
     }
   ],
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 38097deccf8..a83d73453fb 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
@@ -115,13 +115,87 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
+          "start_line": 13,
+          "end_line": 13,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
+          "matched_text": "license          = { :file => '../LICENSE' }"
+        },
+        {
+          "score": 100.0,
+          "from_file": "flutter_playtabs_bridge/LICENSE",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_14.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
+          "matched_text": "MIT License"
+        },
+        {
+          "score": 100.0,
+          "from_file": "flutter_playtabs_bridge/LICENSE",
+          "start_line": 5,
+          "end_line": 21,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+        }
       ]
     },
     {
       "identifier": "mit-ac40beba-5702-f54d-755f-333441314bb0",
       "license_expression": "mit",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "flutter_playtabs_bridge/LICENSE",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_14.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
+          "matched_text": "MIT License"
+        },
+        {
+          "score": 100.0,
+          "from_file": "flutter_playtabs_bridge/LICENSE",
+          "start_line": 5,
+          "end_line": 21,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+        }
+      ]
     }
   ],
   "files": [
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 8f453614eef..f434eb9daab 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
@@ -101,13 +101,59 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "nanopb/nanopb.podspec",
+          "start_line": 14,
+          "end_line": 14,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_in_manifest.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
+          "matched_text": "type => 'zlib', :file => 'LICENSE.txt' }"
+        },
+        {
+          "score": 100.0,
+          "from_file": "nanopb/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+        }
       ]
     },
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "nanopb/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+        }
+      ]
     }
   ],
   "files": [
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 62719cbd618..cb9fd3ca93e 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
@@ -96,7 +96,23 @@
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 99.0,
+          "from_file": "base-example/PKG-INFO",
+          "start_line": 16,
+          "end_line": 16,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": "License :: OSI Approved :: BSD License"
+        }
+      ]
     },
     {
       "identifier": "bsd_new-af493d9f-0c66-d9f8-4538-579134812514",
@@ -104,6 +120,36 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base-example/django.po",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 11,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
+          "matched_text": "This file is distributed under the same license as the package."
+        },
+        {
+          "score": 99.0,
+          "from_file": "PKG-INFO",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": "- 'License :: OSI Approved :: BSD License'"
+        }
       ]
     }
   ],
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 91b9f0a562c..1edcc00e92c 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
@@ -4759,43 +4759,155 @@
       "identifier": "bsd_new-008266ae-6939-ad31-3617-228b0809863c",
       "license_expression": "bsd-new",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 441,
+          "end_line": 441,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_195.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
+          "matched_text": "License: BSD-3-clause"
+        }
+      ]
     },
     {
       "identifier": "bsd_original-9198bafe-47c0-f9dc-5ef1-bd276a69786e",
       "license_expression": "bsd-original",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1501,
+          "end_line": 1501,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original",
+          "rule_identifier": "bsd-original_43.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
+          "matched_text": "License: BSD-4-clause"
+        }
+      ]
     },
     {
       "identifier": "bsd_simplified-2383ae10-5494-e069-46c2-e2d6cb56951f",
       "license_expression": "bsd-simplified",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright.in",
+          "start_line": 2880,
+          "end_line": 2880,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-simplified",
+          "rule_identifier": "bsd-simplified_136.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
+          "matched_text": "License: BSD (2 clause)"
+        }
+      ]
     },
     {
       "identifier": "free_unknown-34d6195a-6206-be2e-4bd2-ce3b9493a1ad",
       "license_expression": "free-unknown",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/po/fr.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 11,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
+          "matched_text": "This file is distributed under the same license as the package."
+        }
+      ]
     },
     {
       "identifier": "free_unknown-fddf748a-9953-bc6c-cb9d-91001840e335",
       "license_expression": "free-unknown",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/po/de.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 10,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
+          "matched_text": "This file is distributed under the same license as the"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus-227f50b1-f05e-5b3b-b107-ae1e2f56448b",
       "license_expression": "gpl-2.0-plus",
       "detection_count": 44,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright.in",
+          "start_line": 2692,
+          "end_line": 2692,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_687.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
+          "matched_text": "License: GPL (v2 or later)"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus-53a26be2-1f88-01ec-d294-921768a513c9",
       "license_expression": "gpl-2.0-plus",
       "detection_count": 42,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 297,
+          "end_line": 297,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
+          "rule_relevance": 100,
+          "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+"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus-fed2dc38-09ac-103e-1b86-4a4f5c00614a",
@@ -4804,31 +4916,433 @@
       "detection_log": [
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1099,
+          "end_line": 1099,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_67.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
+          "matched_text": "GPL-2+)."
+        }
       ]
     },
     {
       "identifier": "gpl_2_0_plus_and_free_unknown-7df72521-0609-4896-2583-44c45dd3f8e6",
       "license_expression": "gpl-2.0-plus AND free-unknown",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 411,
+          "end_line": 411,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 413,
+          "end_line": 413,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_and_free_unknown-f9cd0597-d35d-ec72-0e6b-77970ad90317",
       "license_expression": "gpl-2.0-plus AND free-unknown",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 560,
+          "end_line": 560,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 562,
+          "end_line": 562,
+          "matched_length": 10,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
+          "matched_text": "This file is distributed under the same license as the"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_and_gpl_3_0_plus_and_lgpl_2_1_plus_and_lgpl_3_0_plus_and_bsd_new_and_bsd_original_and_mit_and_public_domain_and_other_permissive-9e2a213a-3fc4-9ee3-8e3f-783829530b14",
       "license_expression": "gpl-2.0-plus AND gpl-3.0-plus AND lgpl-2.1-plus AND lgpl-3.0-plus AND bsd-new AND bsd-original AND mit AND public-domain AND other-permissive",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_89.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
+          "matched_text": "GPL-3+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_64.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
+          "matched_text": "LGPL-2.1+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
+          "matched_text": "LGPL-3+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_10.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
+          "matched_text": "BSD-3-clause"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1521,
+          "end_line": 1521,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original",
+          "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
+          "matched_text": "BSD-4-clause"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1523,
+          "end_line": 1523,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1524,
+          "end_line": 1539,
+          "matched_length": 136,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_1038.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
+          "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1541,
+          "end_line": 1541,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_92.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1542,
+          "end_line": 1557,
+          "matched_length": 136,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_512.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
+          "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1559,
+          "end_line": 1559,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_108.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1560,
+          "end_line": 1577,
+          "matched_length": 146,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_418.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
+          "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1579,
+          "end_line": 1579,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_437.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
+          "matched_text": "License: Expat"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1580,
+          "end_line": 1596,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1598,
+          "end_line": 1598,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_195.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
+          "matched_text": "License: BSD-3-clause"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1599,
+          "end_line": 1621,
+          "matched_length": 213,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_577.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1623,
+          "end_line": 1623,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original",
+          "rule_identifier": "bsd-original_43.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
+          "matched_text": "License: BSD-4-clause"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1624,
+          "end_line": 1649,
+          "matched_length": 236,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original",
+          "rule_identifier": "bsd-original_71.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1651,
+          "end_line": 1651,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_166.RULE",
+          "rule_relevance": 100,
+          "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+"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1652,
+          "end_line": 1663,
+          "matched_length": 105,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_189.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
+          "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
+        },
+        {
+          "score": 99.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1665,
+          "end_line": 1665,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "public-domain",
+          "rule_identifier": "pypi_public_domain.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
+          "matched_text": "License: public-domain"
+        },
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1666,
+          "end_line": 1669,
+          "matched_length": 40,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "other-permissive",
+          "rule_identifier": "other-permissive_325.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
+          "matched_text": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
+        }
+      ]
     },
     {
       "identifier": "lgpl_3_0_plus-4c8d95b2-1acf-7a81-473c-d8e70962288c",
       "license_expression": "lgpl-3.0-plus",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 968,
+          "end_line": 968,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_166.RULE",
+          "rule_relevance": 100,
+          "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+"
+        }
+      ]
     },
     {
       "identifier": "mit-1f9f2ae8-7020-0a13-7934-461c752929a4",
@@ -4837,6 +5351,22 @@
       "detection_log": [
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1429,
+          "end_line": 1429,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_437.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
+          "matched_text": "License: Expat"
+        }
       ]
     },
     {
@@ -4846,6 +5376,22 @@
       "detection_log": [
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
+      ],
+      "sample_matches": [
+        {
+          "score": 99.0,
+          "from_file": "fusiondirectory/debian/copyright",
+          "start_line": 1094,
+          "end_line": 1094,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "public-domain",
+          "rule_identifier": "pypi_public_domain.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
+          "matched_text": "License: public-domain"
+        }
       ]
     }
   ],
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 2213a0d8322..1f4bee613f4 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
@@ -189,13 +189,45 @@
       "identifier": "apache_2_0_and_cc_by_nc_nd_3_0_and_other_permissive_and_proprietary_license-21b00e16-ec3a-6dc3-3971-5dbd5f5b756a",
       "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND proprietary-license",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 5.88,
+          "from_file": "google_appengine_sdk/django-1.2/MANIFEST.in",
+          "start_line": 7,
+          "end_line": 9,
+          "matched_length": 5,
+          "match_coverage": 5.88,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND proprietary-license",
+          "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
+          "matched_text": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
+        }
+      ]
     },
     {
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
       "detection_count": 6,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 99.0,
+          "from_file": "google_appengine_sdk/django-1.2/setup.py",
+          "start_line": 89,
+          "end_line": 89,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": "License :: OSI Approved :: BSD License',"
+        }
+      ]
     },
     {
       "identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653",
@@ -203,13 +235,59 @@
       "detection_count": 5,
       "detection_log": [
         "unknown-reference-in-file-to-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_3.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
+          "matched_text": "This file is distributed under the same license as the Django package."
+        },
+        {
+          "score": 99.0,
+          "from_file": "django-1.2/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": "- 'License :: OSI Approved :: BSD License'"
+        }
       ]
     },
     {
       "identifier": "bsd_new-72cae3bc-4423-3a9e-be84-ee8bb5120a4d",
       "license_expression": "bsd-new",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "google_appengine_sdk/django-1.3/LICENSE",
+          "start_line": 4,
+          "end_line": 27,
+          "matched_length": 214,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-new",
+          "rule_identifier": "bsd-new_683.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
+          "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+        }
+      ]
     },
     {
       "identifier": "bsd_new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7",
@@ -217,6 +295,36 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-in-file-to-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/django.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 99.0,
+          "from_file": "django-1.2/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "bsd-new",
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_relevance": 99,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
+          "matched_text": "- 'License :: OSI Approved :: BSD License'"
+        }
       ]
     }
   ],
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 95a9709ee86..5c141a6ffb6 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
@@ -391,13 +391,73 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-in-file-to-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 10,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
+          "matched_text": "This file is distributed under the same license as the"
+        },
+        {
+          "score": 100.0,
+          "from_file": "setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "Apache 2.0"
+        },
+        {
+          "score": 95.0,
+          "from_file": "setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "pypi_apache_no-version.RULE",
+          "rule_relevance": 95,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
+          "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
+        }
       ]
     },
     {
       "identifier": "apache_2_0-999670be-3d5e-ebf8-ae18-b555c26c5e80",
       "license_expression": "apache-2.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 66.67,
+          "from_file": "paddlenlp/README.md",
+          "start_line": 305,
+          "end_line": 307,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_1215.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
+          "matched_text": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-abb5bcc3-dac9-a935-3392-31a86beb482a",
@@ -405,43 +465,183 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "paddlenlp/README_en.md",
+          "start_line": 221,
+          "end_line": 221,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_83.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
+          "matched_text": "is provided under the [Apache-2.0 License](./LICENSE)."
+        },
+        {
+          "score": 99.81,
+          "from_file": "paddlenlp/LICENSE",
+          "start_line": 3,
+          "end_line": 203,
+          "matched_length": 1582,
+          "match_coverage": 100.0,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_164.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
+          "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+        }
       ]
     },
     {
       "identifier": "apache_2_0-ec8d7936-cda2-7097-40cf-dbe8a06e916e",
       "license_expression": "apache-2.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 99.81,
+          "from_file": "paddlenlp/LICENSE",
+          "start_line": 3,
+          "end_line": 203,
+          "matched_length": 1582,
+          "match_coverage": 100.0,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_164.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
+          "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-3972bfb2-eb21-3d0c-d862-1642babb9f95",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 74.36,
+          "from_file": "paddlenlp/setup.py",
+          "start_line": 1,
+          "end_line": 13,
+          "matched_length": 87,
+          "match_coverage": 74.36,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_1297.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1297.RULE",
+          "matched_text": "All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this [file] except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "paddlenlp/hubconf.py",
+          "start_line": 3,
+          "end_line": 13,
+          "matched_length": 85,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_7.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
+          "matched_text": "Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "paddlenlp/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "Apache 2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-da72644e-69e0-e2c0-89c5-5d42277b3f3b",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 95.0,
+          "from_file": "paddlenlp/setup.py",
+          "start_line": 75,
+          "end_line": 75,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "pypi_apache_no-version.RULE",
+          "rule_relevance": 95,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
+          "matched_text": "License :: OSI Approved :: Apache Software License',"
+        },
+        {
+          "score": 100.0,
+          "from_file": "paddlenlp/setup.py",
+          "start_line": 78,
+          "end_line": 78,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "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')"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-e267f9d9-ae62-e9c9-9cc2-8cd0a1e4928f",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 95.0,
+          "from_file": "paddlenlp/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "pypi_apache_no-version.RULE",
+          "rule_relevance": 95,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
+          "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
+        }
+      ]
     }
   ],
   "files": [
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 eca6861505f..ca5c7cc82bb 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
@@ -6,7 +6,23 @@
       "identifier": "gpl_3_0-ab79e5a8-e510-cbf4-5302-ef968484bcdf",
       "license_expression": "gpl-3.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "physics/COPYING",
+          "start_line": 2,
+          "end_line": 675,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0-76e8f741-ece2-d587-493c-92b0b1e4bdfe",
@@ -14,6 +30,106 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 7,
+          "end_line": 7,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 11,
+          "end_line": 11,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 15,
+          "end_line": 15,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 19,
+          "end_line": 19,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/uk.po",
+          "start_line": 23,
+          "end_line": 23,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/COPYING",
+          "start_line": 2,
+          "end_line": 675,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
       ]
     },
     {
@@ -22,19 +138,193 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 7,
+          "end_line": 7,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 11,
+          "end_line": 11,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 15,
+          "end_line": 15,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 19,
+          "end_line": 19,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 23,
+          "end_line": 23,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/po/en_US.po",
+          "start_line": 27,
+          "end_line": 27,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
+          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/COPYING",
+          "start_line": 2,
+          "end_line": 675,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
       ]
     },
     {
       "identifier": "gpl_3_0_and_unknown_license_reference_and_gpl_3_0_plus-ebd5f076-5cba-e641-e071-0028c4ee0ddb",
       "license_expression": "gpl-3.0 AND unknown-license-reference AND gpl-3.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "physics/myelements/callbacks.py",
+          "start_line": 13,
+          "end_line": 13,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_203.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_203.RULE",
+          "matched_text": "License:  GPLv3 |"
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/myelements/callbacks.py",
+          "start_line": 13,
+          "end_line": 13,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_367.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_367.RULE",
+          "matched_text": "See LICENSE for the full text"
+        },
+        {
+          "score": 100.0,
+          "from_file": "physics/myelements/callbacks.py",
+          "start_line": 14,
+          "end_line": 25,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
+          "matched_text": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see ."
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "physics/physics.py",
+          "start_line": 10,
+          "end_line": 21,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
+          "matched_text": "This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see ."
+        }
+      ]
     }
   ],
   "files": [
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 f1b2cb73739..615a2a4b0cd 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
@@ -264,31 +264,195 @@
       "identifier": "cc_by_sa_3_0_and_cc_by_sa_4_0_and_dco_1_1-4fb8e409-441a-1243-5a0d-d6af2acc0c62",
       "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
       "detection_count": 3,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 75.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 121,
+          "end_line": 122,
+          "matched_length": 12,
+          "match_coverage": 75.0,
+          "matcher": "3-seq",
+          "license_expression": "cc-by-sa-3.0",
+          "rule_identifier": "cc-by-sa-3.0_10.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
+          "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 122,
+          "end_line": 122,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-sa-4.0",
+          "rule_identifier": "cc-by-sa-4.0_71.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
+          "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 123,
+          "end_line": 123,
+          "matched_length": 7,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "dco-1.1",
+          "rule_identifier": "dco-1.1_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
+          "matched_text": "Developer's Certificate of Origin 1.1\""
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus-4347f44c-ada6-f802-86dd-14a96429fac1",
       "license_expression": "gpl-1.0-plus",
       "detection_count": 3,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 63,
+          "end_line": 63,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
+          "matched_text": "the GNU General Public License,"
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus_and_lgpl_3_0_plus_and_gpl_3_0_and_lgpl_3_0-3bd18dcd-0a4c-d46f-f42e-3d2919be9be0",
       "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
       "detection_count": 3,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 76,
+          "end_line": 76,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
+          "matched_text": "GNU GPL"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 79,
+          "end_line": 79,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
+          "matched_text": "the GNU General Public License"
+        },
+        {
+          "score": 47.22,
+          "from_file": "samba/README.contributing",
+          "start_line": 79,
+          "end_line": 81,
+          "matched_length": 17,
+          "match_coverage": 47.22,
+          "matcher": "3-seq",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_103.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
+          "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 84,
+          "end_line": 84,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_12.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
+          "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 85,
+          "end_line": 85,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0",
+          "rule_identifier": "lgpl-3.0_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
+          "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0-29c387aa-50e0-0530-7b0b-aa32e3c372d6",
       "license_expression": "gpl-2.0",
       "detection_count": 3,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 81.82,
+          "from_file": "samba/README.md",
+          "start_line": 6,
+          "end_line": 6,
+          "matched_length": 9,
+          "match_coverage": 81.82,
+          "matcher": "3-seq",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1142.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
+          "matched_text": "Free Software licensed under the GNU General Public License"
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0-ab79e5a8-e510-cbf4-5302-ef968484bcdf",
       "license_expression": "gpl-3.0",
       "detection_count": 3,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/COPYING",
+          "start_line": 1,
+          "end_line": 674,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0-db305a6e-7013-4ffa-0ad4-09f113582e67",
@@ -296,6 +460,36 @@
       "detection_count": 3,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/README.md",
+          "start_line": 22,
+          "end_line": 24,
+          "matched_length": 24,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_579.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
+          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/COPYING",
+          "start_line": 1,
+          "end_line": 674,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
       ]
     },
     {
@@ -304,13 +498,227 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/source3/locale/net/de.po",
+          "start_line": 4,
+          "end_line": 4,
+          "matched_length": 10,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "free-unknown",
+          "rule_identifier": "free-unknown-package_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
+          "matched_text": "This file is distributed under the same license as the"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/COPYING",
+          "start_line": 1,
+          "end_line": 674,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 63,
+          "end_line": 63,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
+          "matched_text": "the GNU General Public License,"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 76,
+          "end_line": 76,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
+          "matched_text": "GNU GPL"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 79,
+          "end_line": 79,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
+          "matched_text": "the GNU General Public License"
+        },
+        {
+          "score": 47.22,
+          "from_file": "samba/README.contributing",
+          "start_line": 79,
+          "end_line": 81,
+          "matched_length": 17,
+          "match_coverage": 47.22,
+          "matcher": "3-seq",
+          "license_expression": "lgpl-3.0-plus",
+          "rule_identifier": "lgpl-3.0-plus_103.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
+          "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 84,
+          "end_line": 84,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_12.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
+          "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 85,
+          "end_line": 85,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-3.0",
+          "rule_identifier": "lgpl-3.0_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
+          "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+        },
+        {
+          "score": 75.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 121,
+          "end_line": 122,
+          "matched_length": 12,
+          "match_coverage": 75.0,
+          "matcher": "3-seq",
+          "license_expression": "cc-by-sa-3.0",
+          "rule_identifier": "cc-by-sa-3.0_10.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
+          "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 122,
+          "end_line": 122,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-sa-4.0",
+          "rule_identifier": "cc-by-sa-4.0_71.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
+          "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.contributing",
+          "start_line": 123,
+          "end_line": 123,
+          "matched_length": 7,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "dco-1.1",
+          "rule_identifier": "dco-1.1_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
+          "matched_text": "Developer's Certificate of Origin 1.1\""
+        },
+        {
+          "score": 81.82,
+          "from_file": "samba/README.md",
+          "start_line": 6,
+          "end_line": 6,
+          "matched_length": 9,
+          "match_coverage": 81.82,
+          "matcher": "3-seq",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1142.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
+          "matched_text": "Free Software licensed under the GNU General Public License"
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/README.md",
+          "start_line": 22,
+          "end_line": 24,
+          "matched_length": 24,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl-1.0-plus_579.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
+          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+        },
+        {
+          "score": 100.0,
+          "from_file": "samba/COPYING",
+          "start_line": 1,
+          "end_line": 674,
+          "matched_length": 5514,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0",
+          "rule_identifier": "gpl-3.0_204.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
+          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+        }
       ]
     },
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "samba/source3/locale/net/genmsg",
+          "start_line": 5,
+          "end_line": 16,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
+          "matched_text": "This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see ."
+        }
+      ]
     }
   ],
   "files": [
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 19db3463d91..204cb2c214e 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
@@ -119,13 +119,59 @@
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
+          "start_line": 11,
+          "end_line": 13,
+          "matched_length": 26,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_375.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+          "start_line": 1,
+          "end_line": 8,
+          "matched_length": 43,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_394.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
+          "matched_text": null
+        }
       ]
     },
     {
       "identifier": "apache_2_0-8607fc22-7931-3e71-b7d5-bd208970dc6f",
       "license_expression": "apache-2.0",
       "detection_count": 2,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+          "start_line": 1,
+          "end_line": 8,
+          "matched_length": 43,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_394.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 4dd02a8a2f4..e8b3c09660c 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
@@ -235,37 +235,133 @@
       "detection_count": 2,
       "detection_log": [
         "from-package-file"
+      ],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml",
+          "start_line": 3,
+          "end_line": 18,
+          "matched_length": 119,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
+          "matched_text": null
+        }
       ]
     },
     {
       "identifier": "apache_2_0-2e855fd2-d4e6-f202-a2a4-6953b9354518",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_42.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
+          "matched_text": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-482220ca-c07b-bf59-66ed-6e7eaf9f3b1e",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 95.0,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/NOTICE",
+          "start_line": 5,
+          "end_line": 6,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_product_includes_2.RULE",
+          "rule_relevance": 95,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-8352cbe6-d199-3a43-cdc8-b14a837e2ce6",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
+          "start_line": 6,
+          "end_line": 6,
+          "matched_length": 11,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_osgi.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-aef5c472-cdfd-dc5f-c152-40e3d96f140e",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/LICENSE",
+          "start_line": 2,
+          "end_line": 4,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_791.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-f089be2e-5d2c-9289-8733-3880be15665c",
       "license_expression": "apache-2.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 64.18,
+          "from_file": "johnzon-jsonb-1.2.11/META-INF/DEPENDENCIES",
+          "start_line": 9,
+          "end_line": 13,
+          "matched_length": 43,
+          "match_coverage": 100.0,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_1247.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 77fb57fa680..2235fbd90a0 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
@@ -106,13 +106,45 @@
       "identifier": "cc0_1_0-15f5e40e-1981-f373-7acf-8ebdfa09ee21",
       "license_expression": "cc0-1.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
+          "start_line": 86,
+          "end_line": 91,
+          "matched_length": 20,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_197.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc0_1_0-6bdf45cc-fe1e-2f20-02e3-fbae31f10c0e",
       "license_expression": "cc0-1.0",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
+          "start_line": 1,
+          "end_line": 2,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_203.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
+          "matched_text": "- name: CC0 Universal\n  url: http://www.creativecommons.org/publicdomain/zero/1.0/"
+        }
+      ]
     }
   ],
   "files": [
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 e22173a6aa3..c261e3175d8 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
@@ -576,22 +576,128 @@
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
-      "detection_count": 4
+      "detection_count": 4,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml",
+          "start_line": 2,
+          "end_line": 15,
+          "matched_length": 119,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-482220ca-c07b-bf59-66ed-6e7eaf9f3b1e",
       "license_expression": "apache-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 95.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
+          "start_line": 5,
+          "end_line": 6,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_product_includes_2.RULE",
+          "rule_relevance": 95,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-aef5c472-cdfd-dc5f-c152-40e3d96f140e",
       "license_expression": "apache-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
+          "start_line": 2,
+          "end_line": 4,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_791.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-e7633baf-a264-a1ab-40f6-a28ec157067a",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+          "start_line": 11,
+          "end_line": 11,
+          "matched_length": 17,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+          "start_line": 13,
+          "end_line": 13,
+          "matched_length": 17,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+          "start_line": 15,
+          "end_line": 15,
+          "matched_length": 17,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+          "start_line": 19,
+          "end_line": 19,
+          "matched_length": 17,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 3470d1434f2..23b872569fe 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
@@ -117,37 +117,205 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
-      "detection_count": 5
+      "detection_count": 5,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 15,
+          "end_line": 15,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 8,
+          "end_line": 8,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-59433771-4926-870e-d21a-8162cfa060a3",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 27,
+          "end_line": 27,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-707ccf7a-5c60-0e4c-5844-349c989a00f5",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.cfg",
+          "start_line": 87,
+          "end_line": 87,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-6e6256c5-00ca-dcb6-8033-2fc4b6ff86be",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.py",
+          "start_line": 31,
+          "end_line": 31,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.py",
+          "start_line": 35,
+          "end_line": 35,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 69f67a5ce23..0165793de74 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -3,12 +3,44 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+          "start_line": 25,
+          "end_line": 51,
+          "matched_length": 243,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original-uc",
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/main.c",
+          "start_line": 5,
+          "end_line": 12,
+          "matched_length": 50,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index b97e432554f..11749329191 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -3,12 +3,44 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+          "start_line": 25,
+          "end_line": 51,
+          "matched_length": 243,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original-uc",
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/main.c",
+          "start_line": 5,
+          "end_line": 12,
+          "matched_length": 50,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 09da8575aba..d5d0c3e1228 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -4,7 +4,23 @@
       "identifier": "lgpl_2_1-694bd705-92dd-1a63-d099-ca6c411c469a",
       "license_expression": "lgpl-2.1",
       "detection_count": 1,
-      "detection_log": []
+      "detection_log": [],
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "test.txt",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1",
+          "rule_identifier": "lgpl-2.1_38.RULE",
+          "rule_relevance": 100,
+          "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"
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json
index f638c47b359..9e5053ead0d 100644
--- a/tests/scancode/data/plugin_only_findings/basic.expected.json
+++ b/tests/scancode/data/plugin_only_findings/basic.expected.json
@@ -5,12 +5,44 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+          "start_line": 25,
+          "end_line": 51,
+          "matched_length": 243,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "bsd-original-uc",
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic.tgz/basic/main.c",
+          "start_line": 5,
+          "end_line": 12,
+          "matched_length": 50,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 47c50fc2fd6..ce267ee3527 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
@@ -119,22 +119,86 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 5
+      "detection_count": 5,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package-build/component/src1",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package-build/package/package.json",
+          "start_line": 5,
+          "end_line": 5,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0-864c0c2e-be17-d035-c591-df0235f46a09",
       "license_expression": "gpl-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package-build/package/src2",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1336.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_0-3903e697-0f73-0feb-d95d-198a91825d0f",
       "license_expression": "lgpl-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "component-package-build/component/src4",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.0",
+          "rule_identifier": "lgpl-2.0_bare_id.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
index facb950aafe..d19ab575369 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
@@ -73,22 +73,86 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 5
+      "detection_count": 5,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package/component/src1",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package/package/package.json",
+          "start_line": 5,
+          "end_line": 5,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0-864c0c2e-be17-d035-c591-df0235f46a09",
       "license_expression": "gpl-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "component-package/package/src2",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1336.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_0-3903e697-0f73-0feb-d95d-198a91825d0f",
       "license_expression": "lgpl-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "component-package/component/src4",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.0",
+          "rule_identifier": "lgpl-2.0_bare_id.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
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 66076f09986..6a63b826430 100644
--- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
@@ -5,12 +5,72 @@
     {
       "identifier": "apache_2_0-b955b3e8-dd31-4357-9227-7a93de3b06a1",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "license-holder-rollup/no-majority/foo/baz",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "license-intro_2.RULE",
+          "rule_relevance": 50,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "license-holder-rollup/no-majority/foo/baz",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0-1e023d4a-9b9a-a032-f999-6d506ad4bcde",
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "license-holder-rollup/clear-majority/dir1/file1",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_208.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "license-holder-rollup/clear-majority/dir1/file1",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
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 7dd51ccbddb..b97dbfcd388 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
@@ -5,7 +5,37 @@
     {
       "identifier": "gpl_2_0-20789449-d01b-5c54-146e-d0c746e6368a",
       "license_expression": "gpl-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "multiple-same-holder-and-license/bar",
+          "start_line": 4,
+          "end_line": 4,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1074.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "multiple-same-holder-and-license/bar",
+          "start_line": 5,
+          "end_line": 5,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_1074.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
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 ff38d4c2f89..d33aa964464 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
@@ -73,12 +73,44 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 6
+      "detection_count": 6,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package-files-not-counted-in-license-holders/src1",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package-files-not-counted-in-license-holders/package/package.json",
+          "start_line": 5,
+          "end_line": 5,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
index 02d56f52544..5e274c6147e 100644
--- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
@@ -73,12 +73,44 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 4
+      "detection_count": 4,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "apache-2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package/package.json",
+          "start_line": 4,
+          "end_line": 4,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
index 316438f8b58..f2a8b741df7 100644
--- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
@@ -73,12 +73,44 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package-manifest/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "apache-2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "package-manifest/package.json",
+          "start_line": 4,
+          "end_line": 4,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [],
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 7db28dc972f..ba74b946ed9 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
@@ -5,7 +5,23 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 4
+      "detection_count": 4,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "report-subdirectory-with-minority-origin/b",
+          "start_line": 3,
+          "end_line": 7,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
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 a0df1f9a789..fbbc6e68998 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
@@ -5,12 +5,72 @@
     {
       "identifier": "apache_2_0-b955b3e8-dd31-4357-9227-7a93de3b06a1",
       "license_expression": "apache-2.0",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "return-nested-local-majority/foo/bar",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "license-intro_2.RULE",
+          "rule_relevance": 50,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "return-nested-local-majority/foo/bar",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0-1e023d4a-9b9a-a032-f999-6d506ad4bcde",
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "return-nested-local-majority/foo/local-majority/baz",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_208.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "return-nested-local-majority/foo/local-majority/baz",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "consolidated_components": [
diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json
index a2a6ca2cfd4..e8cde4591c7 100644
--- a/tests/summarycode/data/score/basic-expected.json
+++ b/tests/summarycode/data/score/basic-expected.json
@@ -276,17 +276,65 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic/index.js",
+          "start_line": 2,
+          "end_line": 19,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic/package.json",
+          "start_line": 7,
+          "end_line": 7,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "basic/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
index a38530c2a3f..74b9d9a0183 100644
--- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
+++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -276,22 +276,86 @@
     {
       "identifier": "gpl_2_0_plus-1db96703-cb36-48f4-1493-265d3d85eb9e",
       "license_expression": "gpl-2.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "inconsistent_licenses_copyleft/util.js",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 8,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "inconsistent_licenses_copyleft/index.js",
+          "start_line": 2,
+          "end_line": 19,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "inconsistent_licenses_copyleft/package.json",
+          "start_line": 7,
+          "end_line": 7,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "inconsistent_licenses_copyleft/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json
index 4ccfa315c31..2f0130a5f17 100644
--- a/tests/summarycode/data/score/jar-expected.json
+++ b/tests/summarycode/data/score/jar-expected.json
@@ -228,22 +228,100 @@
     {
       "identifier": "apache_2_0-ab23f79b-ec38-9a8a-9b23-85059407f34d",
       "license_expression": "apache-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jar/META-INF/LICENSE.txt",
+          "start_line": 2,
+          "end_line": 202,
+          "matched_length": 1584,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jar/org/jboss/logging/AbstractLoggerProvider.java",
+          "start_line": 6,
+          "end_line": 16,
+          "matched_length": 85,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_7.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-4800df2e-4a56-bac0-cac1-9fd31da23344",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+          "start_line": 24,
+          "end_line": 30,
+          "matched_length": 25,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_1227.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-efc1b129-3bcc-a9c0-71ea-964bc53d5512",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_48.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
+          "matched_text": "- name: Apache License, version 2.0"
+        },
+        {
+          "score": 100.0,
+          "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 9,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_42.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
+          "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json
index f551ac0695d..b3bcb19cca9 100644
--- a/tests/summarycode/data/score/no_license_ambiguity-expected.json
+++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json
@@ -100,32 +100,170 @@
     {
       "identifier": "apache_2_0-e3938c59-cc73-037c-3372-e20c26c25f48",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/LICENSE-APACHE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_875.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-7ff6dd9d-b5e8-3fa4-dd61-c5a634c9b300",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 94.12,
+          "from_file": "no_license_ambiguity/COPYRIGHT",
+          "start_line": 1,
+          "end_line": 7,
+          "matched_length": 48,
+          "match_coverage": 100.0,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_1060.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 97.83,
+          "from_file": "no_license_ambiguity/COPYRIGHT",
+          "start_line": 6,
+          "end_line": 9,
+          "matched_length": 45,
+          "match_coverage": 100.0,
+          "matcher": "3-seq",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_47.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a9138d4e-bc0e-0a20-76fd-237047e6d41c",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 57.69,
+          "from_file": "no_license_ambiguity/README.md",
+          "start_line": 152,
+          "end_line": 157,
+          "matched_length": 15,
+          "match_coverage": 57.69,
+          "matcher": "3-seq",
+          "license_expression": "mit OR apache-2.0",
+          "rule_identifier": "mit_or_apache-2.0_9.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/README.md",
+          "start_line": 157,
+          "end_line": 157,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_154.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/LICENSE-MIT",
+          "start_line": 4,
+          "end_line": 26,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/LICENSE-MIT",
+          "start_line": 4,
+          "end_line": 26,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit_or_apache_2_0-480eec53-1a80-0150-7c7e-39cf79c9f3a8",
       "license_expression": "mit OR apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/Cargo.toml",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit OR apache-2.0",
+          "rule_identifier": "mit_or_apache-2.0_15.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
+          "matched_text": "MIT OR Apache-2.0"
+        }
+      ]
     },
     {
       "identifier": "mit_or_apache_2_0-719f8427-422e-8023-c20e-9f8dd0af13b9",
       "license_expression": "mit OR apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_ambiguity/Cargo.toml",
+          "start_line": 5,
+          "end_line": 5,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit OR apache-2.0",
+          "rule_identifier": "mit_or_apache-2.0_14.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json
index f3bf69da22b..e16e4827479 100644
--- a/tests/summarycode/data/score/no_license_text-expected.json
+++ b/tests/summarycode/data/score/no_license_text-expected.json
@@ -276,12 +276,44 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_text/package.json",
+          "start_line": 7,
+          "end_line": 7,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "no_license_text/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     }
   ],
   "files": [
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 7d358d4dfb1..b59765c8b28 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
@@ -52,22 +52,128 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "codebase/src/a.py",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "codebase/src/a.py",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0_and_gpl_2_0_plus-d3814696-f4d1-6a85-1134-6baea31b797a",
       "license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/tests/test_a.py",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-1.0-plus",
+          "rule_identifier": "gpl_208.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "codebase/tests/test_a.py",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0",
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 50.0,
+          "from_file": "codebase/tests/test_a.py",
+          "start_line": 2,
+          "end_line": 2,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
+          "rule_relevance": 50,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 d409b0dea6c..276c8533b43 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
@@ -40,12 +40,44 @@
     {
       "identifier": "gpl_2_0_plus-9b44ef18-69db-1b2d-f6ce-dd439fc51603",
       "license_expression": "gpl-2.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
+          "start_line": 8,
+          "end_line": 19,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_119.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
+          "start_line": 1,
+          "end_line": 12,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json
index 83b9be21626..4c313150bab 100644
--- a/tests/summarycode/data/summary/holders/clear_holder.expected.json
+++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json
@@ -40,17 +40,79 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "clear_holder/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "clear_holder/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "clear_holder/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "clear_holder/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json
index 01c789a9e4c..3b0c6251ab6 100644
--- a/tests/summarycode/data/summary/holders/combined_holders.expected.json
+++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json
@@ -36,17 +36,79 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "combined_holders/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "combined_holders/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "combined_holders/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "combined_holders/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
index 6fc56345ef9..c265ad864b9 100644
--- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
@@ -40,12 +40,44 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "ambiguous/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "ambiguous/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
index 9254000dc23..1c61bf4ef00 100644
--- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
@@ -36,17 +36,79 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "unambiguous/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "unambiguous/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "unambiguous/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "unambiguous/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 9b9a44ad671..cef14c7d2d8 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
@@ -191,37 +191,163 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "apache-2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/setup.py",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/cargo.toml",
+          "start_line": 4,
+          "end_line": 4,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/cargo.toml",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 226abde6257..2deb21c5ab5 100644
--- a/tests/summarycode/data/summary/single_file/single_file.expected.json
+++ b/tests/summarycode/data/summary/single_file/single_file.expected.json
@@ -22,7 +22,23 @@
     {
       "identifier": "jetty-a0130d29-e7f1-bc37-111a-fccd6b1c6b58",
       "license_expression": "jetty",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/jetty.LICENSE",
+          "start_line": 1,
+          "end_line": 132,
+          "matched_length": 996,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "jetty",
+          "rule_identifier": "jetty.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 039b6d6221b..25f98d9947c 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
@@ -131,37 +131,205 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 13,
+          "end_line": 13,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-707ccf7a-5c60-0e4c-5844-349c989a00f5",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.cfg",
+          "start_line": 87,
+          "end_line": 87,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 6,
+          "end_line": 6,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-59433771-4926-870e-d21a-8162cfa060a3",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/PKG-INFO",
+          "start_line": 25,
+          "end_line": 25,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "unknown-license-reference",
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/LICENSE.txt",
+          "start_line": 3,
+          "end_line": 20,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-6e6256c5-00ca-dcb6-8033-2fc4b6ff86be",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.py",
+          "start_line": 31,
+          "end_line": 31,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "pip-22.0.4/setup.py",
+          "start_line": 35,
+          "end_line": 35,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 970a6a633ca..4b89d366e57 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
@@ -122,7 +122,23 @@
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/setup.py",
+          "start_line": 4,
+          "end_line": 14,
+          "matched_length": 85,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_7.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 ab4f946abcf..c4c3abff36b 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
@@ -112,27 +112,121 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/setup.py",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "matched_text": "apache-2.0"
+        }
+      ]
     },
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/setup.py",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 b0b8425c6d1..a7e6ae5abf5 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
@@ -36,17 +36,79 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/apache-2.0.LICENSE",
+          "start_line": 1,
+          "end_line": 176,
+          "matched_length": 1410,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 80.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0",
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_relevance": 80,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "codebase/README.txt",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "apache-2.0 OR mit",
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "codebase/mit.LICENSE",
+          "start_line": 1,
+          "end_line": 18,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "files": [
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 2cb565ded46..305140d0a18 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
@@ -5,12 +5,44 @@
     {
       "identifier": "gpl_2_0_plus-9b44ef18-69db-1b2d-f6ce-dd439fc51603",
       "license_expression": "gpl-2.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
+          "start_line": 8,
+          "end_line": 19,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus",
+          "rule_identifier": "gpl-2.0-plus_119.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
+          "start_line": 1,
+          "end_line": 12,
+          "matched_length": 102,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "gpl-3.0-plus",
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "tallies": {
diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
index b531d8553b2..f27ec88be97 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
@@ -3335,62 +3335,268 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "scan/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
+          "rule_relevance": 50,
+          "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-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/package.json",
+          "start_line": 198,
+          "end_line": 198,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 32,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "boost-1.0",
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/GuardedBy.java",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-2.5",
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 99.69,
+          "from_file": "scan/cc0-1.0.LICENSE",
+          "start_line": 1,
+          "end_line": 98,
+          "matched_length": 978,
+          "match_coverage": 99.69,
+          "matcher": "3-seq",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/ada/zlib.ads",
+          "start_line": 6,
+          "end_line": 25,
+          "matched_length": 176,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+          "start_line": 7,
+          "end_line": 20,
+          "matched_length": 125,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/iostream2/zstream.h",
+          "start_line": 9,
+          "end_line": 15,
+          "matched_length": 71,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit-old-style",
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
-      "detection_count": 7
+      "detection_count": 7,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/adler32.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/infback9/infback9.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+          "start_line": 17,
+          "end_line": 31,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "tallies": {
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 5d100e63f2f..99e94abf9a4 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
@@ -3335,62 +3335,268 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "scan/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
+          "rule_relevance": 50,
+          "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-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/package.json",
+          "start_line": 198,
+          "end_line": 198,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 32,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "boost-1.0",
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/GuardedBy.java",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-2.5",
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 99.69,
+          "from_file": "scan/cc0-1.0.LICENSE",
+          "start_line": 1,
+          "end_line": 98,
+          "matched_length": 978,
+          "match_coverage": 99.69,
+          "matcher": "3-seq",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/ada/zlib.ads",
+          "start_line": 6,
+          "end_line": 25,
+          "matched_length": 176,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+          "start_line": 7,
+          "end_line": 20,
+          "matched_length": 125,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/iostream2/zstream.h",
+          "start_line": 9,
+          "end_line": 15,
+          "matched_length": 71,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit-old-style",
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
-      "detection_count": 7
+      "detection_count": 7,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/adler32.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/infback9/infback9.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+          "start_line": 17,
+          "end_line": 31,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "tallies": {
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 70f2fd13b5b..117dd3ab6a9 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
@@ -3335,62 +3335,268 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 50.0,
+          "from_file": "scan/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "1-hash",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
+          "rule_relevance": 50,
+          "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-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/package.json",
+          "start_line": 198,
+          "end_line": 198,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 32,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "boost-1.0",
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/GuardedBy.java",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-2.5",
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 99.69,
+          "from_file": "scan/cc0-1.0.LICENSE",
+          "start_line": 1,
+          "end_line": 98,
+          "matched_length": 978,
+          "match_coverage": 99.69,
+          "matcher": "3-seq",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/ada/zlib.ads",
+          "start_line": 6,
+          "end_line": 25,
+          "matched_length": 176,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+          "start_line": 7,
+          "end_line": 20,
+          "matched_length": 125,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/iostream2/zstream.h",
+          "start_line": 9,
+          "end_line": 15,
+          "matched_length": 71,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit-old-style",
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
-      "detection_count": 7
+      "detection_count": 7,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/adler32.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/infback9/infback9.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+          "start_line": 17,
+          "end_line": 31,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "tallies": {
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 9042d65ef6b..537005b533d 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
@@ -37,57 +37,247 @@
       {
         "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
         "license_expression": "artistic-2.0",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/package.json",
+            "start_line": 198,
+            "end_line": 198,
+            "matched_length": 4,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "artistic-2.0",
+            "rule_identifier": "artistic-2.0_46.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
         "license_expression": "boost-1.0",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+            "start_line": 4,
+            "end_line": 5,
+            "matched_length": 32,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "boost-1.0",
+            "rule_identifier": "boost-1.0_21.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
         "license_expression": "cc-by-2.5",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/JGroups/src/GuardedBy.java",
+            "start_line": 4,
+            "end_line": 5,
+            "matched_length": 14,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "cc-by-2.5",
+            "rule_identifier": "cc-by-2.5_4.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
         "license_expression": "cc0-1.0",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 99.69,
+            "from_file": "scan/cc0-1.0.LICENSE",
+            "start_line": 1,
+            "end_line": 98,
+            "matched_length": 978,
+            "match_coverage": 99.69,
+            "matcher": "3-seq",
+            "license_expression": "cc0-1.0",
+            "rule_identifier": "cc0-1.0_155.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
         "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/zlib/ada/zlib.ads",
+            "start_line": 6,
+            "end_line": 25,
+            "matched_length": 176,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+            "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
         "license_expression": "lgpl-2.1-plus",
-        "detection_count": 3
+        "detection_count": 3,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+            "start_line": 7,
+            "end_line": 20,
+            "matched_length": 125,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "lgpl-2.1-plus",
+            "rule_identifier": "lgpl-2.1-plus_59.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
         "license_expression": "mit-old-style",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/zlib/iostream2/zstream.h",
+            "start_line": 9,
+            "end_line": 15,
+            "matched_length": 71,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "mit-old-style",
+            "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
         "license_expression": "zlib",
-        "detection_count": 7
+        "detection_count": 7,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/arch/adler32.c",
+            "start_line": 3,
+            "end_line": 3,
+            "matched_length": 12,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "zlib",
+            "rule_identifier": "zlib_5.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+            "matched_text": null
+          },
+          {
+            "score": 100.0,
+            "from_file": "scan/arch/zlib.h",
+            "start_line": 6,
+            "end_line": 23,
+            "matched_length": 144,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "zlib",
+            "rule_identifier": "zlib_17.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
         "license_expression": "zlib",
-        "detection_count": 2
+        "detection_count": 2,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/zlib/infback9/infback9.c",
+            "start_line": 3,
+            "end_line": 3,
+            "matched_length": 12,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "zlib",
+            "rule_identifier": "zlib_5.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
         "license_expression": "zlib",
-        "detection_count": 2
+        "detection_count": 2,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/arch/zlib.h",
+            "start_line": 6,
+            "end_line": 23,
+            "matched_length": 144,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "zlib",
+            "rule_identifier": "zlib_17.RULE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+            "matched_text": null
+          }
+        ]
       },
       {
         "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
         "license_expression": "zlib",
-        "detection_count": 1
+        "detection_count": 1,
+        "sample_matches": [
+          {
+            "score": 100.0,
+            "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+            "start_line": 17,
+            "end_line": 31,
+            "matched_length": 132,
+            "match_coverage": 100.0,
+            "matcher": "2-aho",
+            "license_expression": "zlib",
+            "rule_identifier": "zlib.LICENSE",
+            "rule_relevance": 100,
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+            "matched_text": null
+          }
+        ]
       }
     ]
   },
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 25709d6bad8..e51ee97ca86 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
@@ -3,57 +3,247 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/package.json",
+          "start_line": 198,
+          "end_line": 198,
+          "matched_length": 4,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "artistic-2.0",
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 32,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "boost-1.0",
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/GuardedBy.java",
+          "start_line": 4,
+          "end_line": 5,
+          "matched_length": 14,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "cc-by-2.5",
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 99.69,
+          "from_file": "scan/cc0-1.0.LICENSE",
+          "start_line": 1,
+          "end_line": 98,
+          "matched_length": 978,
+          "match_coverage": 99.69,
+          "matcher": "3-seq",
+          "license_expression": "cc0-1.0",
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/ada/zlib.ads",
+          "start_line": 6,
+          "end_line": 25,
+          "matched_length": 176,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
-      "detection_count": 3
+      "detection_count": 3,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+          "start_line": 7,
+          "end_line": 20,
+          "matched_length": 125,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "lgpl-2.1-plus",
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/iostream2/zstream.h",
+          "start_line": 9,
+          "end_line": 15,
+          "matched_length": 71,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit-old-style",
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
-      "detection_count": 7
+      "detection_count": 7,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/adler32.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/infback9/infback9.c",
+          "start_line": 3,
+          "end_line": 3,
+          "matched_length": 12,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_5.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/arch/zlib.h",
+          "start_line": 6,
+          "end_line": 23,
+          "matched_length": 144,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib_17.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+          "start_line": 17,
+          "end_line": 31,
+          "matched_length": 132,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "zlib",
+          "rule_identifier": "zlib.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "tallies": {
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 e165c57a400..895ad071100 100644
--- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
+++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
@@ -172,27 +172,121 @@
     {
       "identifier": "mit-e634e936-0701-7555-bfaa-1fce0c174838",
       "license_expression": "mit",
-      "detection_count": 2
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/README.md",
+          "start_line": 20,
+          "end_line": 20,
+          "matched_length": 5,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_12.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": "https://github.com/niklasvh/base64-arraybuffer/blob/master/LICENSE-MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/package.json",
+          "start_line": 1,
+          "end_line": 1,
+          "matched_length": 1,
+          "match_coverage": 100.0,
+          "matcher": "1-spdx-id",
+          "license_expression": "mit",
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "MIT"
+        }
+      ]
     },
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT",
+          "start_line": 3,
+          "end_line": 22,
+          "matched_length": 161,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit.LICENSE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
+          "matched_text": null
+        }
+      ]
     },
     {
       "identifier": "mit-f9ae5fa5-0848-4d18-62fc-d668971434b3",
       "license_expression": "mit",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/package.json",
+          "start_line": 18,
+          "end_line": 20,
+          "matched_length": 3,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_272.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
+          "matched_text": null
+        },
+        {
+          "score": 100.0,
+          "from_file": "base64-arraybuffer-0.1.4/package.json",
+          "start_line": 21,
+          "end_line": 21,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "matcher": "2-aho",
+          "license_expression": "mit",
+          "rule_identifier": "mit_30.RULE",
+          "rule_relevance": 100,
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
+          "matched_text": null
+        }
+      ]
     }
   ],
   "todo": [],
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 037e94ad1a5..7228780685a 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
@@ -6,6 +6,22 @@
       "detection_count": 1,
       "detection_log": [
         "unknown-match"
+      ],
+      "sample_matches": [
+        {
+          "score": 86.89,
+          "from_file": "unknown-license.txt",
+          "start_line": 1,
+          "end_line": 10,
+          "matched_length": 53,
+          "match_coverage": 100.0,
+          "matcher": "6-unknown",
+          "license_expression": "unknown",
+          "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
+        }
       ]
     }
   ],
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 4c65a5765c9..3c3eb546e6f 100644
--- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
+++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
@@ -3,7 +3,23 @@
     {
       "identifier": "unknown-b0897d47-1c91-9898-2364-2e4d1a34b6fd",
       "license_expression": "unknown",
-      "detection_count": 1
+      "detection_count": 1,
+      "sample_matches": [
+        {
+          "score": 86.89,
+          "from_file": "unknown-license.txt",
+          "start_line": 1,
+          "end_line": 10,
+          "matched_length": 53,
+          "match_coverage": 100.0,
+          "matcher": "6-unknown",
+          "license_expression": "unknown",
+          "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
+          "rule_relevance": 100,
+          "rule_url": null,
+          "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
+        }
+      ]
     }
   ],
   "todo": [

From a0d246e342f3623671957f25903a09c9459eb304 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Mon, 11 Dec 2023 20:58:36 +0530
Subject: [PATCH 04/11] Add rule attributes to todo items

In case of license detection issues in todo items,
add rule attributes as additional context which are
usually not added to license match data.

Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/detection.py                 |  9 +++++
 src/licensedcode/models.py                    | 27 ++++++++++++++
 src/summarycode/todo.py                       | 37 +++++++++++++++++--
 ...ti-orig-tarball-package-expected-diag.json |  7 ++++
 .../unknown-license-expected-diag.json        |  7 ++++
 .../unknown-license-expected.json             |  7 ++++
 6 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py
index 96abdc49967..48168a3a753 100644
--- a/src/licensedcode/detection.py
+++ b/src/licensedcode/detection.py
@@ -643,6 +643,7 @@ def to_dict(
         include_text=False,
         license_text_diagnostics=False,
         whole_lines=True,
+        rule_details=False,
     ):
         """
         Return a "result" scan data built from a LicenseMatch object.
@@ -668,6 +669,14 @@ def to_dict(
         result['rule_relevance'] = self.rule.relevance
         result['rule_url'] = self.rule.rule_url
 
+        # Extra rule details added optionally
+        if rule_details:
+            result.update(self.rule.get_flags_mapping())
+            result["rule_length"] = self.rule.length
+            result["rule_text"] = self.rule.text
+            result["rule_notes"] = self.rule.notes
+            result["referenced_filenames"] = self.rule.referenced_filenames
+
         if include_text:
             result['matched_text'] = matched_text
 
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index d81cae1126f..01919ede7a6 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -1950,6 +1950,33 @@ def get_min_high_matched_length(self, unique=False):
         return (self.min_high_matched_length_unique if unique
                 else self.min_high_matched_length)
 
+    def get_flags_mapping(self):
+        """
+        Return a list of boolean attributes for a rule which are set to True.
+        """
+
+        rule_boolean_attributes = [
+            'is_license_text',
+            'is_license_text',
+            'is_license_notice',
+            'is_license_reference',
+            'is_license_tag',
+            'is_license_intro',
+            'is_license_clue',
+            'is_continuous',
+            'is_builtin',
+            'is_from_license',
+            'is_synthetic',
+        ]
+
+        mapping = {}
+        for attribute in rule_boolean_attributes:
+            value = getattr(self, attribute)
+            if value:
+                mapping[attribute] = True
+
+        return mapping
+
     def to_reference(self):
         """
         Return a mapping of reference data for this Rule object.
diff --git a/src/summarycode/todo.py b/src/summarycode/todo.py
index e69b4d1b903..135b26e5c61 100644
--- a/src/summarycode/todo.py
+++ b/src/summarycode/todo.py
@@ -20,6 +20,7 @@
 from licensedcode.detection import get_ambiguous_license_detections_by_type
 from licensedcode.detection import get_uuid_on_content
 from licensedcode.detection import UniqueDetection
+from licensedcode.detection import LicenseMatchFromResult
 from plugincode.post_scan import PostScanPlugin, post_scan_impl
 from packageurl import PackageURL
 
@@ -222,13 +223,23 @@ class AmbiguousDetection:
     """
     Detections which needs review.
     """
+
+    detection_type = attr.ib(
+        default=None,
+        metadata=dict(
+            help='A string determining what type of detection this object is, '
+            'the possible values for this are : `package` and `license` '
+        )
+    )
+
     detection_id = attr.ib(
         default=None,
         metadata=dict(
             help='A detection ID identifying an unique detection. '
-            'This has two parts one with the type of detection in string, '
-            'like `package`/`license` and a positive integer '
-            'denoting the detection number.'
+            'For a license detection this is an id with the license, '
+            'expression and an UUID based on the match content. '
+            'For a package detection this is the purl and the UUID as '
+            'a qualifier.'
         )
     )
 
@@ -269,6 +280,7 @@ def from_package(cls, package_data, detection_log, file_path):
         )
         review_comments = get_review_comments(detection_log)
         return cls(
+            detection_type='package',
             detection_id=detection_id,
             detection=package_data,
             review_comments=review_comments,
@@ -287,6 +299,7 @@ def from_license(cls, detection, detection_log, file_regions):
             license_diagnostics=license_diagnostics,
         )
         return cls(
+            detection_type='license',
             detection_id=detection.identifier,
             detection=detection_mapping,
             review_comments=review_comments,
@@ -299,9 +312,25 @@ def dict_fields(attr, value):
             if attr.name == 'file_regions':
                 return False
 
+            if attr.name == 'detection_type':
+                return False
+
             return True
 
-        return attr.asdict(self, filter=dict_fields, dict_factory=dict)
+        detection_mapping = attr.asdict(self, filter=dict_fields, dict_factory=dict)
+        if self.detection_type == 'license':
+            # add rule attributes to the match details
+            matches_with_details = []
+            for license_match in detection_mapping["detection"]["matches"]:
+                license_match_obj = LicenseMatchFromResult.from_dict(license_match)
+                matches_with_details.append(license_match_obj.to_dict(
+                    include_text=True,
+                    license_text_diagnostics=True,
+                    rule_details=True,
+                ))
+            detection_mapping["detection"]["matches"] = matches_with_details
+
+        return detection_mapping
 
 
 class PackageDetectionCategory(Enum):
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 0ae3e652d0a..3ec987225dc 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
@@ -21,6 +21,13 @@
             "rule_identifier": "borceux.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
+            "is_license_text": true,
+            "is_builtin": true,
+            "is_from_license": true,
+            "rule_length": 85,
+            "rule_text": "Copyright 1993 Francis Borceux\nYou may freely use, modify, and/or distribute each of the files in this package without limitation.  The package consists of the following files:\n\nREADME\ncompatibility/OldDiagram\ncompatibility/OldMaxiDiagram\ncompatibility/OldMicroDiagram\ncompatibility/OldMiniDiagram\ncompatibility/OldMultipleArrows\ndiagram/Diagram\ndiagram/MaxiDiagram\ndiagram/MicroDiagram\ndiagram/MiniDiagram\ndiagram/MultipleArrows\nuser-guides/Diagram_Mode_d_Emploi\nuser-guides/Diagram_Read_Me\n\nOf course no support is guaranteed, but the author will attempt to assist with problems.  Current email address:\nfrancis dot borceux at uclouvain dot be.",
+            "rule_notes": null,
+            "referenced_filenames": [],
             "matched_text": "package consists of [various] [tarballs].\n\n[This] README"
           }
         ],
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 7228780685a..b2ecf84ac59 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
@@ -46,6 +46,13 @@
             "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
             "rule_relevance": 100,
             "rule_url": null,
+            "is_license_notice": true,
+            "is_builtin": true,
+            "is_synthetic": true,
+            "rule_length": 53,
+            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof.",
+            "rule_notes": "Unknown license based on a composite of license words.",
+            "referenced_filenames": [],
             "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
           }
         ],
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 3c3eb546e6f..da9f48191b6 100644
--- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
+++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
@@ -43,6 +43,13 @@
             "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
             "rule_relevance": 100,
             "rule_url": null,
+            "is_license_notice": true,
+            "is_builtin": true,
+            "is_synthetic": true,
+            "rule_length": 53,
+            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
+            "rule_notes": "Unknown license based on a composite of license words.",
+            "referenced_filenames": [],
             "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
           }
         ],

From e10358e05c027dedd852443820c990052281d9e8 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Tue, 12 Dec 2023 21:52:43 +0530
Subject: [PATCH 05/11] Add license_expression_spdx in Detections

Adds a new attribute license_expression_spdx to both LicenseMatch and
LicenseDetection objects, and reflected also in top-level detections and
todo items. Basically this adds the SPDX license-expression everywhere
we have a license-expression.

Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/cache.py                     |   3 +-
 src/licensedcode/detection.py                 |  21 +
 src/licensedcode/match.py                     |   1 +
 src/licensedcode/models.py                    |   5 +-
 src/licensedcode/plugin_license.py            |   5 +
 src/packagedcode/licensing.py                 |  10 +
 .../filtered-expected.json                    |   4 +
 .../filtered-expected2.json                   |   4 +
 .../filtered-expected3.json                   |   4 +
 .../data/common/manifests-expected.json       |  59 ++
 .../data/common/manifests-expected.jsonlines  |  59 ++
 .../data/common/manifests-expected.yaml       |  59 ++
 .../data/csv/livescan/expected.csv            |  40 +-
 .../data/csv/packages/expected-no-root.csv    |   2 +-
 .../data/csv/packages/expected.csv            |   2 +-
 .../yaml/package-and-licenses-expected.yaml   |  24 +
 ...tional_license_combined_test.expected.json |  12 +
 ...ional_license_directory_test.expected.json |   6 +
 ...ditional_license_plugin_test.expected.json |   4 +
 ...e-reference-works-with-clues.expected.json |  77 +++
 ...-matched-text-with-reference.expected.json |  16 +
 .../scan-with-reference.expected.json         |  16 +
 .../data/match_spdx/scan-expected.json        |   4 +
 .../unknown-license-expected.json             |   4 +
 .../unknown-license-text-expected.json        |   4 +
 .../clues/woodstox.expected.json              |   9 +
 .../license-expression/scan.expected.json     |   8 +
 .../spdx-expressions.expected.json            |   6 +
 .../license-ref-see-copying.expected.json     |  10 +
 .../license_reference/scan-ref.expected.json  |  10 +
 ...-unknown-reference-copyright.expected.json |  19 +
 .../license_reference/scan-wref.expected.json |   4 +
 ...unknown-ref-to-key-file-root.expected.json |  46 ++
 .../license_url/license_url.expected.json     |   4 +
 ...own-intro-eclipse-foundation.expected.json |   5 +
 .../package/package.expected.json             |  10 +
 .../scan/e2fsprogs-expected.json              |   5 +
 .../scan/ffmpeg-license.expected.json         |  36 ++
 .../sqlite/sqlite.expected.json               | 274 +++++++++
 .../text/scan-diag.expected.json              |   8 +
 .../plugin_license/text/scan.expected.json    |   8 +
 .../text_long_lines/scan-diag.expected.json   |   8 +
 .../text_long_lines/scan.expected.json        |   8 +
 ...n-unknown-intro-dual-license.expected.json |  10 +
 ...tro-eclipse-foundation-tycho.expected.json |  54 ++
 ...own-intro-eclipse-foundation.expected.json |   6 +
 ...nown-intro-long-gaps-between.expected.json |  12 +
 ...intro-with-imperfect-matches.expected.json |  10 +
 .../file_with_multiple_licenses.expected.json |   6 +
 .../policy-codebase.expected.json             |  20 +
 .../plugin_license_text/scan.expected.json    |  22 +
 .../data/about/aboutfiles.expected.json       |   8 +
 .../data/about/apipkg.ABOUT-expected          |   2 +
 .../data/about/appdirs.ABOUT-expected         |   2 +
 ...r-layer.tar.xz-get-installed-expected.json |  28 +
 ...-container-layer.tar.xz-scan-expected.json |  56 ++
 .../bluedevil/APKBUILD-expected.json          |   2 +
 .../breeze-grub/APKBUILD-expected.json        |   2 +
 .../breeze-gtk/APKBUILD-expected.json         |   2 +
 .../breeze-plymouth/APKBUILD-expected.json    |   2 +
 .../community/breeze/APKBUILD-expected.json   |   2 +
 .../community/discover/APKBUILD-expected.json |   2 +
 .../community/drkonqi/APKBUILD-expected.json  |   2 +
 .../jool-modules-lts/APKBUILD-expected.json   |   2 +
 .../jool-modules-rpi/APKBUILD-expected.json   |   2 +
 .../kactivitymanagerd/APKBUILD-expected.json  |   2 +
 .../kde-cli-tools/APKBUILD-expected.json      |   2 +
 .../kde-gtk-config/APKBUILD-expected.json     |   2 +
 .../kdecoration/APKBUILD-expected.json        |   2 +
 .../kdeplasma-addons/APKBUILD-expected.json   |   2 +
 .../community/kgamma5/APKBUILD-expected.json  |   2 +
 .../community/khotkeys/APKBUILD-expected.json |   2 +
 .../kinfocenter/APKBUILD-expected.json        |   2 +
 .../kmenuedit/APKBUILD-expected.json          |   2 +
 .../community/kscreen/APKBUILD-expected.json  |   2 +
 .../kscreenlocker/APKBUILD-expected.json      |   2 +
 .../ksshaskpass/APKBUILD-expected.json        |   2 +
 .../kwallet-pam/APKBUILD-expected.json        |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../kwayland-server/APKBUILD-expected.json    |   2 +
 .../community/kwin/APKBUILD-expected.json     |   2 +
 .../community/kwrited/APKBUILD-expected.json  |   2 +
 .../layer-shell-qt/APKBUILD-expected.json     |   2 +
 .../libkscreen/APKBUILD-expected.json         |   2 +
 .../libksysguard/APKBUILD-expected.json       |   2 +
 .../libreoffice/APKBUILD-expected.json        |   2 +
 .../community/milou/APKBUILD-expected.json    |   2 +
 .../community/mpd/APKBUILD-expected.json      |   2 +
 .../community/oxygen/APKBUILD-expected.json   |   2 +
 .../community/parole/APKBUILD-expected.json   |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../plasma-desktop/APKBUILD-expected.json     |   2 +
 .../plasma-disks/APKBUILD-expected.json       |   2 +
 .../plasma-firewall/APKBUILD-expected.json    |   2 +
 .../plasma-integration/APKBUILD-expected.json |   2 +
 .../plasma-nano/APKBUILD-expected.json        |   2 +
 .../plasma-nm/APKBUILD-expected.json          |   2 +
 .../plasma-pa/APKBUILD-expected.json          |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../plasma-sdk/APKBUILD-expected.json         |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../plasma-thunderbolt/APKBUILD-expected.json |   2 +
 .../plasma-vault/APKBUILD-expected.json       |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../plasma-workspace/APKBUILD-expected.json   |   2 +
 .../plymouth-kcm/APKBUILD-expected.json       |   2 +
 .../polkit-kde-agent-1/APKBUILD-expected.json |   2 +
 .../powerdevil/APKBUILD-expected.json         |   2 +
 .../qqc2-breeze-style/APKBUILD-expected.json  |   2 +
 .../qt6-qtbase/APKBUILD-expected.json         |   2 +
 .../rtpengine-lts/APKBUILD-expected.json      |   2 +
 .../community/sddm-kcm/APKBUILD-expected.json |   2 +
 .../systemsettings/APKBUILD-expected.json     |   2 +
 .../community/ufw/APKBUILD-expected.json      |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../main/cmake/APKBUILD-expected.json         |   2 +
 .../main/kamailio/APKBUILD-expected.json      |   2 +
 .../main/libburn/APKBUILD-expected.json       |   2 +
 .../main/linux-lts/APKBUILD-expected.json     |   2 +
 .../main/linux-rpi/APKBUILD-expected.json     |   2 +
 .../main/lua-unit/APKBUILD-expected.json      |   2 +
 .../main/sqlite-tcl/APKBUILD-expected.json    |   2 +
 .../main/sqlite/APKBUILD-expected.json        |   2 +
 .../alpine14/main/sqsh/APKBUILD-expected.json |   2 +
 .../alpine14/main/sudo/APKBUILD-expected.json |   2 +
 .../main/util-linux/APKBUILD-expected.json    |   2 +
 .../testing/linux-edge/APKBUILD-expected.json |   2 +
 .../testing/linux-elm/APKBUILD-expected.json  |   2 +
 .../testing/linux-gru/APKBUILD-expected.json  |   2 +
 .../community/abook/APKBUILD-expected.json    |   2 +
 .../darktable/APKBUILD-expected.json          |   2 +
 .../community/haxe/APKBUILD-expected.json     |   2 +
 .../linux-firmware/APKBUILD-expected.json     |   2 +
 .../community/2bwm/APKBUILD-expected.json     |   2 +
 .../community/acccheck/APKBUILD-expected.json |   2 +
 .../accerciser/APKBUILD-expected.json         |   2 +
 .../community/alpine/APKBUILD-expected.json   |   2 +
 .../audacious-plugins/APKBUILD-expected.json  |   2 +
 .../boost-build/APKBUILD-expected.json        |   2 +
 .../dircproxy/APKBUILD-expected.json          |   2 +
 .../community/faac/APKBUILD-expected.json     |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../community/gcc6/APKBUILD-expected.json     |   2 +
 .../hunspell-de-de/APKBUILD-expected.json     |   2 +
 .../imagemagick/APKBUILD-expected.json        |   2 +
 .../imagemagick6/APKBUILD-expected.json       |   2 +
 .../community/libluv/APKBUILD-expected.json   |   2 +
 .../nymphcast-client/APKBUILD-expected.json   |   2 +
 .../openjdk10/APKBUILD-expected.json          |   2 +
 .../py3-cairosvg/APKBUILD-expected.json       |   2 +
 .../community/qt6-qt3d/APKBUILD-expected.json |   2 +
 .../ruby-rspec/APKBUILD-expected.json         |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../community/vtk/APKBUILD-expected.json      |   2 +
 .../community/zsnes/APKBUILD-expected.json    |   2 +
 .../alpine14/main/gcc/APKBUILD-expected.json  |   2 +
 .../alpine14/main/icu/APKBUILD-expected.json  |   2 +
 .../alpine14/main/ruby/APKBUILD-expected.json |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../gitlab-release-cli/APKBUILD-expected.json |   2 +
 .../gtksourceviewmm3/APKBUILD-expected.json   |   2 +
 .../testing/pnmixer/APKBUILD-expected.json    |   2 +
 .../APKBUILD-expected.json                    |   2 +
 .../buildbot/APKBUILD-expected.json           |   2 +
 .../full-installed/installed-expected.json    |  28 +
 .../rootfs/alpine-rootfs.tar.xz-expected.json |  56 ++
 .../single-installed/installed-expected.json  |   2 +
 .../small-installed/installed-expected.json   |  28 +
 .../data/bower/author-objects/expected.json   |   6 +
 .../data/bower/basic/expected.json            |   2 +
 .../data/bower/list-of-licenses/expected.json |   6 +
 .../data/bower/scan-expected.json             |  12 +
 .../data/build/buck/end2end-expected.json     |   2 +
 .../cargo/cargo_toml/clap/Cargo.toml.expected |   2 +
 .../cargo_toml/clippy/Cargo.toml.expected     |   2 +
 .../cargo_toml/mdbook/Cargo.toml.expected     |   2 +
 .../cargo_toml/rustfmt/Cargo.toml.expected    |   2 +
 .../cargo_toml/rustup/Cargo.toml.expected     |   2 +
 .../data/cargo/scan.expected.json             |   8 +
 .../data/chef/basic/metadata.json.expected    |   2 +
 .../data/chef/basic/metadata.rb.expected      |   2 +
 .../chef/basic/test_package.json.expected     |   2 +
 ...iew_url_and_bug_tracking_url.json.expected |   2 +
 .../test_package_dependencies.json.expected   |   2 +
 .../basic/test_package_parties.json.expected  |   2 +
 .../chef/dependencies/metadata.rb.expected    |   2 +
 .../data/chef/package.scan.expected.json      |   6 +
 .../assemble/many-podspecs-expected.json      |  24 +
 .../many-podspecs-with-license-expected.json  |  48 ++
 .../assemble/multiple-podspec-expected.json   |   8 +
 .../assemble/single-podspec-expected.json     |   4 +
 .../solo/RxDataSources.podspec-expected.json  |   4 +
 ...rebaseAnalytics.podspec.json.expected.json |   2 +
 .../podspec/BadgeHub.podspec.expected.json    |   2 +
 .../LoadingShimmer.podspec.expected.json      |   2 +
 .../podspec/PayTabsSDK.podspec.expected.json  |   2 +
 .../RxDataSources.podspec.expected.json       |   2 +
 .../podspec/Starscream.podspec.expected.json  |   2 +
 .../podspec/SwiftLib.podspec.expected.json    |   2 +
 ...utter_paytabs_bridge.podspec.expected.json |   2 +
 .../kmmWebSocket.podspec.expected.json        |   2 +
 .../podspec/nanopb.podspec.expected.json      |   2 +
 .../data/conda/meta.yaml.expected.json        |   2 +
 .../data/cran/codetools/package.json.expected |   2 +
 .../data/cran/geometry/package.json.expected  |   2 +
 .../data/debian/basic-rootfs-expected.json    |  24 +
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |  31 ++
 ...m_0.12.5-1_copyright-detailed.expected.yml |   7 +
 .../stable_copyright-detailed.expected.yml    |  92 +++
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |  90 +++
 .../stable_copyright-detailed.expected.yml    |   5 +
 .../stable_copyright-detailed.expected.yml    |  17 +
 .../stable_copyright-detailed.expected.yml    |   9 +
 .../stable_copyright-detailed.expected.yml    |   6 +
 .../stable_copyright-detailed.expected.yml    |  33 ++
 .../stable_copyright-detailed.expected.yml    |   6 +
 .../stable_copyright-detailed.expected.yml    |  25 +
 .../stable_copyright-detailed.expected.yml    |  15 +
 .../stable_copyright-detailed.expected.yml    |   5 +
 ...sck-static.copyright-detailed.expected.yml |   4 +
 ...progs-l10n.copyright-detailed.expected.yml |   4 +
 ...e_libblkid.copyright-detailed.expected.yml |   2 +
 ...ibcom-err2.copyright-detailed.expected.yml |   2 +
 ...ble_libss2.copyright-detailed.expected.yml |   2 +
 ...e_libuuid1.copyright-detailed.expected.yml |   2 +
 ...e_uuid-dev.copyright-detailed.expected.yml |   2 +
 ...id-runtime.copyright-detailed.expected.yml |   2 +
 .../stable_copyright-detailed.expected.yml    |  10 +
 .../stable_copyright-detailed.expected.yml    |  20 +
 .../stable_copyright-detailed.expected.yml    |   3 +
 .../stable_copyright-detailed.expected.yml    |  11 +
 .../stable_copyright-detailed.expected.yml    |  23 +
 .../stable_copyright-detailed.expected.yml    |   6 +
 .../stable_copyright-detailed.expected.yml    |  26 +
 .../stable_copyright-detailed.expected.yml    |  95 ++++
 .../stable_copyright-detailed.expected.yml    |  13 +
 .../stable_copyright-detailed.expected.yml    |   6 +
 .../stable_copyright-detailed.expected.yml    |  14 +
 .../stable_copyright-detailed.expected.yml    |  24 +
 .../stable_copyright-detailed.expected.yml    |  24 +
 .../stable_copyright-detailed.expected.yml    |   3 +
 .../stable_copyright-detailed.expected.yml    |  15 +
 .../stable_copyright-detailed.expected.yml    |  15 +
 .../stable_copyright-detailed.expected.yml    |  15 +
 .../stable_copyright-detailed.expected.yml    |  15 +
 .../stable_copyright-detailed.expected.yml    |   7 +
 .../stable_copyright-detailed.expected.yml    |   4 +
 .../stable_copyright-detailed.expected.yml    |   4 +
 .../stable_copyright-detailed.expected.yml    |  44 ++
 .../stable_copyright-detailed.expected.yml    |  17 +
 .../stable_copyright-detailed.expected.yml    |   8 +
 .../stable_copyright-detailed.expected.yml    |  10 +
 .../stable_copyright-detailed.expected.yml    |  26 +
 .../stable_copyright-detailed.expected.yml    |   8 +
 .../stable_copyright-detailed.expected.yml    |   9 +
 .../stable_copyright-detailed.expected.yml    |   5 +
 .../stable_copyright-detailed.expected.yml    |  17 +
 .../stable_copyright-detailed.expected.yml    |  35 ++
 .../stable_copyright-detailed.expected.yml    |   6 +
 .../stable_copyright-detailed.expected.yml    |  12 +
 .../stable_copyright-detailed.expected.yml    |  11 +
 .../p/perl/copyright-detailed.expected.yml    | 449 +++++++++++++++
 .../stable_copyright-detailed.expected.yml    | 137 +++++
 .../stable_copyright-detailed.expected.yml    |  14 +
 .../stable_copyright-detailed.expected.yml    |   7 +
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |  19 +
 .../stable_copyright-detailed.expected.yml    |  23 +
 .../stable_copyright-detailed.expected.yml    |  16 +
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |   2 +
 .../stable_copyright-detailed.expected.yml    |  40 ++
 .../stable_copyright-detailed.expected.yml    |   3 +
 .../stable_copyright-detailed.expected.yml    |  23 +
 .../z3/stable_copyright-detailed.expected.yml |   5 +
 ...rmware-adi.copyright-detailed.expected.yml |   3 +
 ...d-graphics.copyright-detailed.expected.yml |   4 +
 ...re-atheros.copyright-detailed.expected.yml |  11 +
 ...mware-bnx2.copyright-detailed.expected.yml |   2 +
 ...ware-bnx2x.copyright-detailed.expected.yml |   2 +
 ...-brcm80211.copyright-detailed.expected.yml |   2 +
 ...are-cavium.copyright-detailed.expected.yml |   2 +
 ...ntel-sound.copyright-detailed.expected.yml |  48 ++
 ...intelwimax.copyright-detailed.expected.yml |   2 +
 ...re-ipw2x00.copyright-detailed.expected.yml |   2 +
 ...mware-ivtv.copyright-detailed.expected.yml |   2 +
 ...re-iwlwifi.copyright-detailed.expected.yml |   2 +
 ...e-libertas.copyright-detailed.expected.yml |   4 +
 ...ux-nonfree.copyright-detailed.expected.yml |   3 +
 ...ware-linux.copyright-detailed.expected.yml |   3 +
 ...sc-nonfree.copyright-detailed.expected.yml |  66 +++
 ...re-myricom.copyright-detailed.expected.yml |   2 +
 ...-netronome.copyright-detailed.expected.yml |   2 +
 ...are-netxen.copyright-detailed.expected.yml |   2 +
 ...qcom-media.copyright-detailed.expected.yml |  39 ++
 ...are-qlogic.copyright-detailed.expected.yml |  11 +
 ...are-ralink.copyright-detailed.expected.yml |   3 +
 ...re-realtek.copyright-detailed.expected.yml |   4 +
 ...re-samsung.copyright-detailed.expected.yml |   2 +
 ...ware-siano.copyright-detailed.expected.yml |   2 +
 ...nnectivity.copyright-detailed.expected.yml |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../stable_copyright-detailed.expected.yml    |   7 +
 .../zlib1g/copyright-detailed.expected.yml    |   2 +
 .../adduser/copyright-detailed.expected.yml   |   2 +
 .../doc/apt/copyright-detailed.expected.yml   |   3 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   5 +
 .../doc/bash/copyright-detailed.expected.yml  |  25 +
 .../bsdutils/copyright-detailed.expected.yml  |  31 ++
 .../coreutils/copyright-detailed.expected.yml |  27 +
 .../doc/dash/copyright-detailed.expected.yml  |  14 +
 .../debconf/copyright-detailed.expected.yml   |   2 +
 .../copyright-detailed.expected.yml           |   2 +
 .../copyright-detailed.expected.yml           |   4 +
 .../diffutils/copyright-detailed.expected.yml |   4 +
 .../doc/dpkg/copyright-detailed.expected.yml  |  17 +
 .../e2fsprogs/copyright-detailed.expected.yml |   5 +
 .../findutils/copyright-detailed.expected.yml |   3 +
 .../copyright-detailed.expected.yml           | 137 +++++
 .../copyright-detailed.expected.yml           | 160 ++++++
 .../doc/gpgv/copyright-detailed.expected.yml  |  24 +
 .../doc/grep/copyright-detailed.expected.yml  |   3 +
 .../doc/gzip/copyright-detailed.expected.yml  |   7 +
 .../hostname/copyright-detailed.expected.yml  |   2 +
 .../copyright-detailed.expected.yml           |   5 +
 .../libacl1/copyright-detailed.expected.yml   |  11 +
 .../copyright-detailed.expected.yml           |   3 +
 .../libattr1/copyright-detailed.expected.yml  |  11 +
 .../copyright-detailed.expected.yml           |   6 +
 .../libblkid1/copyright-detailed.expected.yml |  31 ++
 .../copyright-detailed.expected.yml           |   5 +
 .../libc-bin/copyright-detailed.expected.yml  |  41 ++
 .../doc/libc6/copyright-detailed.expected.yml |  41 ++
 .../copyright-detailed.expected.yml           |   5 +
 .../copyright-detailed.expected.yml           |   2 +
 .../libcrypt1/copyright-detailed.expected.yml |  41 ++
 .../libdb5.3/copyright-detailed.expected.yml  |  10 +
 .../copyright-detailed.expected.yml           |   4 +
 .../copyright-detailed.expected.yml           |   5 +
 .../libffi7/copyright-detailed.expected.yml   |   5 +
 .../copyright-detailed.expected.yml           |  35 ++
 .../libgmp10/copyright-detailed.expected.yml  |   5 +
 .../copyright-detailed.expected.yml           | 147 +++++
 .../copyright-detailed.expected.yml           |  10 +
 .../copyright-detailed.expected.yml           |  87 +++
 .../copyright-detailed.expected.yml           |  39 ++
 .../libidn2-0/copyright-detailed.expected.yml |  12 +
 .../copyright-detailed.expected.yml           |  87 +++
 .../copyright-detailed.expected.yml           |   6 +
 .../libkrb5-3/copyright-detailed.expected.yml |  87 +++
 .../liblz4-1/copyright-detailed.expected.yml  |   8 +
 .../liblzma5/copyright-detailed.expected.yml  |  70 +++
 .../libmount1/copyright-detailed.expected.yml |  31 ++
 .../copyright-detailed.expected.yml           |  39 ++
 .../libnsl2/copyright-detailed.expected.yml   |  26 +
 .../copyright-detailed.expected.yml           |  15 +
 .../copyright-detailed.expected.yml           |   3 +
 .../copyright-detailed.expected.yml           |   8 +
 .../libpcre3/copyright-detailed.expected.yml  |   6 +
 .../copyright-detailed.expected.yml           |   3 +
 .../copyright-detailed.expected.yml           |   8 +
 .../copyright-detailed.expected.yml           |   4 +
 .../libsepol1/copyright-detailed.expected.yml |   3 +
 .../copyright-detailed.expected.yml           |  31 ++
 .../libss2/copyright-detailed.expected.yml    |   2 +
 .../libssl1.1/copyright-detailed.expected.yml |   2 +
 .../copyright-detailed.expected.yml           |  18 +
 .../copyright-detailed.expected.yml           |   8 +
 .../libtinfo6/copyright-detailed.expected.yml |   6 +
 .../copyright-detailed.expected.yml           |  16 +
 .../libudev1/copyright-detailed.expected.yml  |  18 +
 .../copyright-detailed.expected.yml           |  18 +
 .../libuuid1/copyright-detailed.expected.yml  |  31 ++
 .../copyright-detailed.expected.yml           |   5 +
 .../libzstd1/copyright-detailed.expected.yml  |   9 +
 .../doc/login/copyright-detailed.expected.yml |   6 +
 .../logsave/copyright-detailed.expected.yml   |   5 +
 .../lsb-base/copyright-detailed.expected.yml  |   5 +
 .../doc/mawk/copyright-detailed.expected.yml  |   2 +
 .../doc/mount/copyright-detailed.expected.yml |  31 ++
 .../copyright-detailed.expected.yml           |   6 +
 .../passwd/copyright-detailed.expected.yml    |   6 +
 .../perl-base/copyright-detailed.expected.yml | 425 ++++++++++++++
 .../doc/sed/copyright-detailed.expected.yml   |   3 +
 .../copyright-detailed.expected.yml           |   3 +
 .../doc/tar/copyright-detailed.expected.yml   |   4 +
 .../copyright-detailed.expected.yml           |  31 ++
 .../zlib1g/copyright-detailed.expected.yml    |   2 +
 .../stable_copyright.expected.yml             |  31 ++
 ...r-layer.tar.xz.get-installed-expected.json |  24 +
 ...-container-layer.tar.xz.scan-expected.json |  24 +
 .../freebsd/basic/+COMPACT_MANIFEST.expected  |   2 +
 .../freebsd/basic2/+COMPACT_MANIFEST.expected |   2 +
 .../dual_license/+COMPACT_MANIFEST.expected   |   4 +
 .../dual_license2/+COMPACT_MANIFEST.expected  |   6 +
 .../multi_license/+COMPACT_MANIFEST.expected  |   4 +
 .../data/haxe/basic/haxelib.json.expected     |   2 +
 .../data/haxe/basic2/haxelib.json.expected    |   2 +
 .../data/haxe/deps/haxelib.json.expected      |   2 +
 .../data/haxe/tags/haxelib.json.expected      |   2 +
 ...cted-with-test-manifests-with-license.json |  26 +
 ...instance-expected-with-test-manifests.json |   4 +
 ...n-package-instance-expected-with-uuid.json |   4 +
 .../python-package-instance-expected.json     |   4 +
 ...ackage-instance-with-license-expected.json |  25 +
 .../activemq-camel.expected.json              |   8 +
 .../google-built-collection.expected.json     |   8 +
 .../jquery-form-3.51.0.expected.json          |  52 ++
 .../fizzler.expected.json                     |  26 +
 .../flutter_playtabs_bridge.expected.json     |  22 +
 ...ytabs_bridge_without_license.expected.json |   4 +
 .../nanopb.expected.json                      |  16 +
 .../nanopb_without_license.expected.json      |   4 +
 .../reference-to-package/base.expected.json   |  14 +
 .../fusiondirectory.expected.json             | 328 +++++++++++
 .../google_appengine_sdk.expected.json        |  57 ++
 .../paddlenlp.expected.json                   |  59 ++
 .../physics.expected.json                     |  52 ++
 .../reference-to-package/samba.expected.json  | 133 +++++
 .../1.0/aopalliance-1.0.pom.package.json      |   2 +
 .../1.5.3/aspectjrt-1.5.3.pom.package.json    |   3 +
 .../0.0.203/bndlib-0.0.203.pom.package.json   |   3 +
 .../0.0.238/bndlib-0.0.238.pom.package.json   |   3 +
 .../data/m2/bytebuddy/pom.xml.package.json    |   2 +
 .../0.9.0.4/c3p0-0.9.0.4.pom.package.json     |   2 +
 .../1.3/commons-codec-1.3.pom.package.json    |   2 +
 .../commons-collections-3.2.pom.package.json  |   2 +
 .../jsch/0.1.23/jsch-0.1.23.pom.package.json  |   3 +
 .../jsch/0.1.27/jsch-0.1.27.pom.package.json  |   2 +
 .../xstream-parent-1.2.2.pom.package.json     |   3 +
 .../data/m2/depman/foo.pom.package.json       |   3 +
 .../1.8/commons-digester-1.8.pom.package.json |   2 +
 .../1.0/commons-el-1.0.pom.package.json       |   2 +
 .../1.8.0.7/hsqldb-1.8.0.7.pom.package.json   |   3 +
 .../1.6.2/httpunit-1.6.2.pom.package.json     |   3 +
 .../1.3.1/commons-io-1.3.1.pom.package.json   |   2 +
 .../3.4.GA/javassist-3.4.GA.pom.package.json  |   3 +
 .../1.0/persistence-api-1.0.pom.package.json  |   3 +
 .../3.3.ga/javassist-3.3.ga.pom.package.json  |   4 +
 ...-5.0.0alpha-200607201-119.pom.package.json |   2 +
 .../jtidy-4aug2000r7-dev.pom.package.json     |   2 +
 .../junit/3.8.1/junit-3.8.1.pom.package.json  |   3 +
 .../junit/3.8.2/junit-3.8.2.pom.package.json  |   3 +
 .../junit/4.4/junit-4.4.pom.package.json      |   3 +
 .../2.1/commons-lang-2.1.pom.package.json     |   2 +
 .../2.3/commons-lang-2.3.pom.package.json     |   2 +
 .../1.2.15/log4j-1.2.15.pom.package.json      |   2 +
 .../commons-logging-1.0.4.pom.package.json    |   2 +
 .../1.1/commons-logging-1.1.pom.package.json  |   2 +
 ...ysql-connector-java-5.0.4.pom.package.json |   4 +
 .../1.2.3/ehcache-1.2.3.pom.package.json      |   4 +
 .../kxml2/2.2.2/kxml2-2.2.2.pom.package.json  |   3 +
 ...egi-security-parent-1.0.5.pom.package.json |   2 +
 ...egi-security-parent-1.0.7.pom.package.json |   2 +
 .../1.1.1/master-1.1.1.pom.package.json       |   4 +
 .../apache/apache/1/apache-1.pom.package.json |   2 +
 .../apache/apache/3/apache-3.pom.package.json |   2 +
 .../apache/apache/4/apache-4.pom.package.json |   2 +
 .../1.22/commons-jaxrs-1.22.pom.package.json  |   3 +
 .../1.1/project-config-1.1.pom.package.json   |   2 +
 .../maven/2.0.1/maven-2.0.1.pom.package.json  |   2 +
 .../maven/2.0.2/maven-2.0.2.pom.package.json  |   2 +
 .../maven/2.0.4/maven-2.0.4.pom.package.json  |   2 +
 .../maven/2.0/maven-2.0.pom.package.json      |   2 +
 ...ven-dependency-plugin-2.0.pom.package.json |   3 +
 .../wagon-file-1.0-alpha-5.pom.package.json   |   2 +
 ...p-lightweight-1.0-alpha-5.pom.package.json |   2 +
 ...-provider-api-1.0-alpha-5.pom.package.json |   2 +
 .../wagon-ssh-1.0-alpha-5.pom.package.json    |   2 +
 .../wagon-1.0-alpha-6.pom.package.json        |   2 +
 .../build/1.1.1/build-1.1.1.pom.package.json  |   3 +
 .../myfaces-master-1.0.5.pom.package.json     |   2 +
 .../1.5/velocity-1.5.pom.package.json         |   2 +
 .../1.5.4/aspectjrt-1.5.4.pom.package.json    |   3 +
 .../1.6.0/aspectjrt-1.6.0.pom.package.json    |   3 +
 .../1.5.4/aspectjtools-1.5.4.pom.package.json |   3 +
 .../1.6.0/aspectjtools-1.6.0.pom.package.json |   3 +
 .../aspectjweaver-1.5.4.pom.package.json      |   3 +
 .../aspectjweaver-1.6.0.pom.package.json      |   3 +
 .../aspectj-maven-plugin-1.0.pom.package.json |   2 +
 ...gin-1.2-20080813.143116-6.pom.package.json |   3 +
 ...maven-plugin-1.2-SNAPSHOT.pom.package.json |   3 +
 ...obertura-maven-plugin-2.2.pom.package.json |   2 +
 ...ndbugs-maven-plugin-1.1.1.pom.package.json |   2 +
 ...-buildnumber-plugin-0.9.6.pom.package.json |   3 +
 .../1.0.11/plexus-1.0.11.pom.package.json     |   2 +
 .../2.3/easymock-2.3.pom.package.json         |   2 +
 ...asymockclassextension-2.3.pom.package.json |   2 +
 ...nate-annotations-3.2.1.ga.pom.package.json |   2 +
 ...nate-annotations-3.3.1.GA.pom.package.json |   2 +
 ...mons-annotations-3.0.0.ga.pom.package.json |   2 +
 ...te-entitymanager-3.2.1.ga.pom.package.json |   2 +
 ...te-entitymanager-3.3.2.GA.pom.package.json |   2 +
 .../hibernate-3.2.1.ga.pom.package.json       |   2 +
 .../hibernate-3.2.6.ga.pom.package.json       |   2 +
 .../7/jetty-parent-7.pom.package.json         |   3 +
 .../6.1.5/project-6.1.5.pom.package.json      |   3 +
 .../servlet-api-2.5-6.1.5.pom.package.json    |   3 +
 .../2.5.3/spring-aop-2.5.3.pom.package.json   |   2 +
 .../spring-aspects-2.5.3.pom.package.json     |   2 +
 .../spring-aspects-2.5.4.pom.package.json     |   2 +
 .../2.5.3/spring-beans-2.5.3.pom.package.json |   2 +
 ...ing-context-support-2.5.3.pom.package.json |   2 +
 .../spring-context-2.5.3.pom.package.json     |   2 +
 .../2.5.3/spring-core-2.5.3.pom.package.json  |   2 +
 .../2.5.3/spring-jdbc-2.5.3.pom.package.json  |   2 +
 .../2.5.3/spring-orm-2.5.3.pom.package.json   |   2 +
 .../2.5.3/spring-test-2.5.3.pom.package.json  |   2 +
 .../2.5.4/spring-test-2.5.4.pom.package.json  |   2 +
 .../2.5.3/spring-tx-2.5.3.pom.package.json    |   2 +
 .../2.5.3/spring-web-2.5.3.pom.package.json   |   2 +
 .../spring-webmvc-2.5.3.pom.package.json      |   2 +
 .../spring-webmvc-2.5.4.pom.package.json      |   2 +
 .../2.5.4/spring-2.5.4.pom.package.json       |   2 +
 .../testng/5.7/testng-5.7.pom.package.json    |   3 +
 .../testng/5.8/testng-5.8.pom.package.json    |   3 +
 .../p6spy/1.3/p6spy-1.3.pom.package.json      |   3 +
 .../jds-2.17.0718b.pom.package.json           |   2 +
 .../parse_error/jds-3.0.1.pom.package.json    |   2 +
 .../common-object-1.0.2.pom.package.json      |   2 +
 .../osgl-http-1.1.2.pom.package.json          |   2 +
 .../commons-validator-1.2.0.pom.package.json  |   2 +
 .../commons-validator-1.3.1.pom.package.json  |   2 +
 .../1.4/velocity-1.4.pom.package.json         |   2 +
 .../1.0.b2/xml-apis-1.0.b2.pom.package.json   |   2 +
 .../1.1.3.1/xmlpull-1.1.3.1.pom.package.json  |   3 +
 .../aopalliance-1.0.pom.package.json          |   3 +
 .../commons-validator-1.2.0.pom.package.json  |   2 +
 ...ndbugs-maven-plugin-1.1.1.pom.package.json |   2 +
 .../maven2/foo-pom/foo-pom.xml.package.json   |   3 +
 .../jrecordbind-2.3.4.pom.package.json        |   3 +
 .../maven2/log4j/log4j-pom.xml.package.json   |   2 +
 .../logback-access.pom.package.json           |   3 +
 .../spring-2.5.4.pom.package.json             |   2 +
 .../spring-orm-2.5.3.pom.package.json         |   2 +
 .../spring-webmvc-2.5.3.pom.package.json      |   2 +
 ...ackson-dataformat-xml-2.13.5-expected.json |  21 +
 .../johnzon-jsonb-1.2.11-expected.json        |  28 +
 .../assemble/numbers-1.7.4-expected.json      |  10 +
 ...htrace-core-4.0.0-incubating-expected.json |  40 ++
 .../data/models/full-expected.json            |   2 +
 .../data/models/simple-expected.json          |   2 +
 .../npm/as_installed/package.json.expected    |   2 +
 .../authors_list_dicts/package.json.expected  |   4 +
 .../package.json.expected                     |   2 +
 .../data/npm/casepath/package.json.expected   |   2 +
 .../data/npm/chartist/package.json.expected   |  10 +
 .../data/npm/dist/package.json.expected       |   2 +
 .../npm/double_license/package.json.expected  |   4 +
 .../data/npm/electron/package.expected.json   |   4 +
 .../express-jwt-3.4.0/package.json.expected   |   4 +
 .../data/npm/from_npmjs/package.json.expected |   2 +
 .../npm/from_tarball/package.json.expected    |   2 +
 .../get_package_resources.scan.expected.json  |   4 +
 .../homepage-as-list/package.json.expected    |   2 +
 .../npm/invalid-dep/package.json.expected     |   2 +
 .../data/npm/keywords/package.json.expected   |   2 +
 .../legacy_license_dict/package.json.expected |   4 +
 .../data/npm/mime-1.3.4/package.json.expected |   2 +
 .../package-lock.json-expected                |   2 +
 .../package-lock.json-expected                |   2 +
 .../data/npm/scan-nested/scan.expected.json   |   8 +
 .../data/npm/scoped1/package.json.expected    |   2 +
 .../data/npm/scoped2/package.json.expected    |   2 +
 .../data/npm/sequelize/package.json.expected  |   2 +
 .../data/npm/uri_vcs/package.json.expected    |   4 +
 .../data/npm/urls_dict/package.json.expected  |   2 +
 .../utils-merge-1.0.0/package.json.expected   |   4 +
 .../data/npm/with_name/package.json.expected  |   4 +
 .../nuget/Castle.Core.nuspec.json.expected    |   2 +
 .../EntityFramework.nuspec.json.expected      |   2 +
 .../Microsoft.AspNet.Mvc.nuspec.json.expected |   2 +
 .../Microsoft.Net.Http.nuspec.json.expected   |   2 +
 .../data/nuget/bootstrap.nuspec.json.expected |   2 +
 .../jQuery.UI.Combined.nuspec.json.expected   |   2 +
 .../data/opam/sample1/output.opam.expected    |   2 +
 .../data/opam/sample3/output.opam.expected    |   2 +
 .../data/opam/sample4/output.opam.expected    |   2 +
 .../data/opam/sample5/output.opam.expected    |   2 +
 .../data/opam/sample6/output.opam.expected    |   2 +
 .../data/opam/sample7/output.opam.expected    |   2 +
 .../data/opam/sample8/output.opam.expected    |   2 +
 .../a-timer/composer.json.expected            |   2 +
 .../phpcomposer/composer.lock-expected.json   |  60 ++
 .../phpcomposer/fake/composer.json.expected   |   2 +
 .../phpcomposer/fake2/composer.json.expected  |   4 +
 .../framework/composer.json.expected          |   2 +
 .../phpcomposer/modern/composer.json.expected |   2 +
 .../phpcomposer/slim/composer.json.expected   |   2 +
 .../data/plugin/about-package-expected.json   |   8 +
 .../data/plugin/bower-package-expected.json   |   4 +
 .../data/plugin/cargo-package-expected.json   |   4 +
 .../data/plugin/chef-package-expected.json    |   6 +
 .../data/plugin/com-package-expected.json     |   2 +
 .../data/plugin/conda-package-expected.json   |   4 +
 .../data/plugin/cran-package-expected.json    |   4 +
 .../data/plugin/freebsd-package-expected.json |   4 +
 .../get_installed_packages-expected.json      |  24 +
 .../data/plugin/haxe-package-expected.json    |   4 +
 .../data/plugin/maven-package-expected.json   |  48 ++
 .../maven-package-with-license-expected.json  |  48 ++
 .../data/plugin/mui-package-expected.json     |   2 +
 .../data/plugin/mun-package-expected.json     |   2 +
 .../data/plugin/nuget-package-expected.json   |   4 +
 .../plugin/phpcomposer-package-expected.json  |   4 +
 .../data/plugin/python-package-expected.json  |  28 +
 .../data/plugin/rpm-package-expected.json     |   4 +
 .../plugin/rubygems-package-expected.json     |   4 +
 .../data/plugin/sys-package-expected.json     |   2 +
 .../data/plugin/tlb-package-expected.json     |   2 +
 .../data/plugin/win_pe-package-expected.json  |   2 +
 .../data/plugin/winmd-package-expected.json   |   2 +
 ...s-1.2.1-py2.py3-none-any.whl-expected.json |   4 +
 ...commoncode-21.5.12-py3.9.egg-expected.json |   2 +
 .../scancode_toolkit.egg-info-expected.json   |   2 +
 .../dist-info-metadata/METADATA-expected.json |   4 +
 .../data/pypi/metadata/PKG-INFO-expected.json |   2 +
 .../pypi/metadata/v10/PKG-INFO-expected.json  |   2 +
 .../pypi/metadata/v11/PKG-INFO-expected.json  |   2 +
 .../pypi/metadata/v12/PKG-INFO-expected.json  |   4 +
 .../pypi/metadata/v20/PKG-INFO-expected.json  |   4 +
 .../pypi/metadata/v21/PKG-INFO-expected.json  |   2 +
 .../flask_setup.py-expected.json              |   4 +
 .../pyyaml_setup.py-expected.json             |   4 +
 .../requests_setup.py-expected.json           |   2 +
 .../sqlalchemy_setup.py-expected.json         |   4 +
 .../unpack_kwargs_setup.py-expected.json      |   2 +
 .../wheel-0.34.2/setup.cfg-expected.json      |   2 +
 .../with_name-setup.py.expected.json          |   2 +
 .../arpy_setup.py-expected.json               |   2 +
 .../setup.py-expected.json                    |   4 +
 .../certifi-2020.6.20/setup.py-expected.json  |   4 +
 .../cffi-1.14.0/setup.py-expected.json        |   4 +
 .../chardet-3.0.4/setup.py-expected.json      |   4 +
 .../docutils-0.16/setup.py-expected.json      |   7 +
 .../idna-2.9/setup.py-expected.json           |   4 +
 .../paho-mqtt-1.5.0/setup.py-expected.json    |   5 +
 .../pexpect-4.6.0/setup.py-expected.json      |   4 +
 .../pip-22.0.4/setup.py-expected.json         |   4 +
 .../pycparser-2.20/setup.py-expected.json     |   4 +
 .../pyserial-3.4/setup.py-expected.json       |   4 +
 .../pytoml-0.1.21/setup.py-expected.json      |   4 +
 .../requests-2.24.0/setup.py-expected.json    |   2 +
 .../setupreader-0.0.3/setup.py-expected.json  |   2 +
 .../six-1.14.0/setup.py-expected.json         |   4 +
 .../urllib3-1.25.9/setup.py-expected.json     |   4 +
 .../setup.py/bluepyopt_setup.py-expected.json |   4 +
 .../boolean2_py_setup.py-expected.json        |   4 +
 .../setup.py/complex_setup.py-expected.json   |   2 +
 .../container_check_setup.py-expected.json    |   4 +
 .../setup.py/fb303_py_setup.py-expected.json  |   2 +
 .../setup.py/frell_src_setup.py-expected.json |   2 +
 .../setup.py/interlap_setup.py-expected.json  |   4 +
 .../pypi/setup.py/mb_setup.py-expected.json   |   2 +
 .../pypi/setup.py/ntfs_setup.py-expected.json |   4 +
 .../setup.py/nvchecker_setup.py-expected.json |   4 +
 ..._agents_common_code_setup.py-expected.json |   5 +
 .../packageurl_python_setup.py-expected.json  |   4 +
 .../pipdeptree_setup.py-expected.json         |   4 +
 .../setup.py/pluggy_setup.py-expected.json    |   2 +
 ...pygtrie_with_kwargs_setup.py-expected.json |   4 +
 .../setup.py/pyrpm_2_setup.py-expected.json   |   4 +
 ...python_publicsuffix_setup.py-expected.json |   4 +
 ...ology_py_libversion_setup.py-expected.json |   4 +
 .../setup.py/saneyaml_setup.py-expected.json  |   4 +
 .../setuppycheck_setup.py-expected.json       |   2 +
 .../setup.py/simple-setup.py-expected.json    |   7 +
 .../setup.py/url_py_setup.py-expected.json    |   4 +
 .../pypi/setup.py/venv_setup.py-expected.json |   4 +
 .../whatsapp-play-setup.py-expected.json      |   4 +
 .../setup.py/xmltodict_setup.py-expected.json |   2 +
 .../site-packages/site-packages-expected.json |  14 +
 .../data/pypi/solo-metadata/expected.json     |   4 +
 .../data/pypi/solo-setup/expected.json        |   4 +
 .../pip-22.0.4-pypi-package-expected.json     |  16 +
 ...ip-22.0.4-pypi-package-setup-expected.json |   4 +
 ....4-pypi-package-with-license-expected.json |  63 +++
 .../PyJPString-0.0.3-expected.json            |   2 +
 .../PyJPString-0.0.3-subdir-expected.json     |   2 +
 .../python-mimeparse-1.6.0-expected.json      |   2 +
 .../pyup-django-0.4.0-expected.json           |   4 +
 .../metadata-1.2/anonapi-0.0.19-expected.json |   4 +
 .../commoncode-21.5.12-expected.json          |   2 +
 .../celery-expected.json                      |  12 +
 .../daglib_wheel_extracted-expected.json      |   8 +
 .../Jinja2-2.10.dist-info-expected.json       |   4 +
 ...on_mimeparse-1.6.0.dist-info-expected.json |   2 +
 .../toml-0.10.1.dist-info-expected.json       |   4 +
 .../urllib3-1.26.4.dist-info-expected.json    |   4 +
 .../haruka_bot-1.2.3.dist-info-expected.json  |   4 +
 .../pip-20.2.2.dist-info-expected.json        |   4 +
 ...plugincode-21.1.21.dist-info-expected.json |   2 +
 .../anonapi-0.0.19.dist-info-expected.json    |   4 +
 .../android/basic/README.android.expected     |   2 +
 .../chromium/basic/README.chromium.expected   |   2 +
 .../facebook/basic/README.facebook.expected   |   2 +
 .../capital-filename/README.FACEBOOK.expected |   2 +
 .../README.facebook.expected                  |   2 +
 .../README.facebook.expected                  |   2 +
 .../project-as-name/README.facebook.expected  |   2 +
 .../README.facebook.expected                  |   2 +
 .../README.facebook.expected                  |   2 +
 .../setuptools/README.facebook.expected       |   2 +
 .../README.facebook.expected                  |   2 +
 .../google/basic/README.google.expected       |   2 +
 .../basic/README.thirdparty.expected          |   2 +
 ...0-4.el6_3.x86_64.rpm-package-expected.json |   2 +
 .../centos-8-rpms.xmlish-expected.json        |   6 +
 .../fc33-rpms.xmlish-expected.json            |   7 +
 .../openmandriva-rpms.xmlish-expected.json    |   4 +
 .../opensuse-rpms.xmlish-expected.json        |   4 +
 .../rhel-rpms.xmlish-expected.json            |   6 +
 .../bdb-fedora-rootfs.tar.xz-expected.json    | 524 ++++++++++++++++++
 .../xmlish/centos-5-rpms.xmlish-expected.json |   4 +
 ...s-5-rpms.xmlish-with-license-expected.json |   4 +
 .../gem/action_tracker-1.0.2.gem.json         |   2 +
 .../data/rubygems/gem/m2r-2.1.0.gem.json      |   2 +
 .../new/dependabot-omnibus-0.87.15.gem.json   |   2 +
 .../gem/new/hiredis-0.6.3-java.gem.json       |   2 +
 .../rubygems/gem/new/int_time-0.0.2.gem.json  |   2 +
 .../gem/new/jaro_winkler-1.5.1-java.gem.json  |   2 +
 .../rubygems/gem/new/rubocop-0.62.0.gem.json  |   2 +
 ...eLibrary.Caching.dll.package-expected.json |   2 +
 .../Moq.Silverlight.dll.package-expected.json |   2 +
 .../Windows.AI.winmd.package-expected.json    |   2 +
 .../_ctypes_test.pyd.package-expected.json    |   2 +
 .../win_pe/chcp.com.package-expected.json     |   2 +
 .../win_pe/clfs.sys.mui.package-expected.json |   2 +
 .../crypt32.dll.mun.package-expected.json     |   2 +
 .../win_pe/euc-jp.so.package-expected.json    |   2 +
 .../win_pe/file.exe.package-expected.json     |   2 +
 .../libiconv2.dll.package-expected.json       |   2 +
 .../win_pe/libintl3.dll.package-expected.json |   2 +
 .../win_pe/stdole2.tlb.package-expected.json  |   2 +
 .../data/win_pe/tbs.sys.package-expected.json |   2 +
 .../win_pe/tre4.dll.package-expected.json     |   2 +
 .../win_pe/zlib1.dll.package-expected.json    |   4 +
 .../data/composer/composer.expected.json      |   4 +
 tests/scancode/data/info/all.expected.json    |   8 +
 .../data/info/all.rooted.expected.json        |   8 +
 .../scancode/data/license_text/test.expected  |   4 +
 .../plugin_only_findings/basic.expected.json  |   8 +
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |   4 +
 .../classify/with_package_data.expected.json  |   6 +
 .../component-package-build-expected.json     |  26 +
 .../component-package-expected.json           |  26 +
 .../license-holder-rollup-expected.json       |  15 +
 ...iple-same-holder-and-license-expected.json |   9 +
 ...t-counted-in-license-holders-expected.json |  20 +
 .../package-fileset-expected.json             |  16 +
 .../package-manifest-expected.json            |  10 +
 ...rectory-with-minority-origin-expected.json |  10 +
 ...return-nested-local-majority-expected.json |  18 +
 .../data/score/basic-expected.json            |  16 +
 ...consistent_licenses_copyleft-expected.json |  20 +
 .../summarycode/data/score/jar-expected.json  |  25 +
 .../score/no_license_ambiguity-expected.json  |  32 ++
 .../data/score/no_license_text-expected.json  |  10 +
 ...nflicting_license_categories.expected.json |  22 +
 .../summary/end-2-end/bug-1141.expected.json  |   8 +
 .../holders/clear_holder.expected.json        |  20 +
 .../holders/combined_holders.expected.json    |  20 +
 .../license_ambiguity/ambiguous.expected.json |   8 +
 .../unambiguous.expected.json                 |  14 +
 .../multiple_package_data.expected.json       |  34 ++
 .../single_file/single_file.expected.json     |   4 +
 .../summary-without-holder-pypi.expected.json |  52 ++
 ...holder_from_package_resource.expected.json |   8 +
 .../with_package_data.expected.json           |  24 +
 .../without_package_data.expected.json        |  14 +
 .../tallies/end-2-end/bug-1141.expected.json  |   8 +
 .../full_tallies/tallies.expected.json        |  78 +++
 .../tallies_by_facet.expected.json            |  78 +++
 .../tallies_details.expected.json             |  78 +++
 ...lies_key_files-details.expected.json-lines |  72 +++
 .../tallies_key_files.expected.json           |  72 +++
 .../data/tallies/packages/expected.json       |  12 +
 .../no_todo/base64-arraybuffer.expected.json  |  28 +
 ...ti-orig-tarball-package-expected-diag.json |   3 +
 .../unknown-license-expected-diag.json        |   6 +
 .../unknown-license-expected.json             |   6 +
 794 files changed, 9436 insertions(+), 25 deletions(-)

diff --git a/src/licensedcode/cache.py b/src/licensedcode/cache.py
index ded71bae586..a257576d2c4 100644
--- a/src/licensedcode/cache.py
+++ b/src/licensedcode/cache.py
@@ -545,11 +545,12 @@ def validate_spdx_license_keys(license_expression, licensing):
         try:
             parsed.render(template='{symbol.wrapped.spdx_license_key}')
         except AttributeError:
+            msg = f"Error rendering SPDX license key for: {key}"
             messages.append(msg)
             pass
 
     if messages:
-        raise InvalidLicenseKeyError(messages)
+        raise InvalidLicenseKeyError(f"ERROR in parsing license_expression: {license_expression}: type: {type(license_expression)} :{messages}")
 
 
 class InvalidLicenseKeyError(Exception):
diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py
index 48168a3a753..4d80c5fbfc5 100644
--- a/src/licensedcode/detection.py
+++ b/src/licensedcode/detection.py
@@ -169,6 +169,12 @@ class LicenseDetection:
             'using the SPDX license expression syntax and ScanCode license keys.')
     )
 
+    license_expression_spdx = attr.ib(
+        default=None,
+        metadata=dict(
+            help='Full license expression string with SPDX license keys.')
+    )
+
     matches = attr.ib(
         default=attr.Factory(list),
         metadata=dict(
@@ -248,8 +254,17 @@ def from_matches(
             detection_log=detection_log,
         )
         detection.identifier = detection.identifier_with_expression
+        detection.license_expression_spdx = detection.spdx_license_expression()
         return detection
 
+    def spdx_license_expression(self):
+        from licensedcode.cache import build_spdx_license_expression
+        from licensedcode.cache import get_cache
+        return str(build_spdx_license_expression(
+            license_expression=self.license_expression,
+            licensing=get_cache().licensing,
+        ))
+
     def __eq__(self, other):
         return (
             isinstance(other, LicenseDetection)
@@ -515,6 +530,7 @@ def from_license_detection_mapping(
 
         detection = cls(
             license_expression=license_detection_mapping["license_expression"],
+            license_expression_spdx=license_detection_mapping["license_expression_spdx"],
             detection_log=license_detection_mapping.get("detection_log", []) or None,
             identifier=license_detection_mapping["identifier"],
             matches=matches,
@@ -665,6 +681,7 @@ def to_dict(
 
         # LicenseDB Level Information (Rule that was matched)
         result['license_expression'] = self.rule.license_expression
+        result['license_expression_spdx'] = self.rule.spdx_license_expression()
         result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
         result['rule_url'] = self.rule.rule_url
@@ -865,6 +882,7 @@ class UniqueDetection:
     """
     identifier = attr.ib(default=None)
     license_expression = attr.ib(default=None)
+    license_expression_spdx = attr.ib(default=None)
     detection_count = attr.ib(default=None)
     matches = attr.ib(default=attr.Factory(list))
     detection_log = attr.ib(default=attr.Factory(list))
@@ -897,12 +915,14 @@ def get_unique_detections(cls, license_detections):
                         for match in detection.matches
                     ]
                 ))
+                detection.license_expression_spdx = detection.spdx_license_expression()
                 detection.identifier = detection.identifier_with_expression
 
             unique_license_detections.append(
                 cls(
                     identifier=detection.identifier,
                     license_expression=detection.license_expression,
+                    license_expression_spdx=detection.license_expression_spdx,
                     detection_log=detection_log or [],
                     matches=detection.matches,
                     detection_count=len(file_regions),
@@ -937,6 +957,7 @@ def dict_fields(attr, value):
     def get_license_detection_object(self):
         return LicenseDetection(
             license_expression=self.license_expression,
+            license_expression_spdx=self.license_expression_spdx,
             detection_log=self.detection_log,
             matches=self.matches,
             identifier=self.identifier,
diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index 8b3f80fbb85..69f0d403508 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -802,6 +802,7 @@ def to_dict(
 
         # LicenseDB Level Information (Rule that was matched)
         result['license_expression'] = self.rule.license_expression
+        result['spdx_license_expression'] = self.rule.spdx_license_expression()
         result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
         result['rule_url'] = self.rule.rule_url
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index 01919ede7a6..94edcb4588e 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -1932,9 +1932,10 @@ def licensing_contains(self, other):
                 expression2=other.license_expression_object,
             )
 
-    def spdx_license_expression(self, licensing=None):
+    def spdx_license_expression(self):
         from licensedcode.cache import build_spdx_license_expression
-        return str(build_spdx_license_expression(self.license_expression, licensing=licensing))
+        from licensedcode.cache import get_cache
+        return str(build_spdx_license_expression(self.license_expression, licensing=get_cache().licensing))
 
     def get_length(self, unique=False):
         return self.length_unique if unique else self.length
diff --git a/src/licensedcode/plugin_license.py b/src/licensedcode/plugin_license.py
index d5625979f3f..7734abc060e 100644
--- a/src/licensedcode/plugin_license.py
+++ b/src/licensedcode/plugin_license.py
@@ -297,7 +297,12 @@ def add_referenced_filenames_license_matches_for_detections(resource, codebase):
             analysis=DetectionCategory.UNKNOWN_FILE_REFERENCE_LOCAL.value,
             post_scan=True,
         )
+        license_expression_spdx = build_spdx_license_expression(
+            license_expression=str(license_expression),
+            licensing=get_cache().licensing,
+        )
         license_detection_mapping["license_expression"] = str(license_expression)
+        license_detection_mapping["license_expression_spdx"] = str(license_expression_spdx)
         license_detection_mapping["detection_log"] = detection_log
         license_detection_mapping["identifier"] = get_new_identifier_from_detections(
             initial_detection=license_detection_mapping,
diff --git a/src/packagedcode/licensing.py b/src/packagedcode/licensing.py
index c1896f077d8..2c576a73a9a 100644
--- a/src/packagedcode/licensing.py
+++ b/src/packagedcode/licensing.py
@@ -133,7 +133,12 @@ def add_referenced_license_matches_for_package(resource, codebase):
                 analysis=DetectionCategory.PACKAGE_UNKNOWN_FILE_REFERENCE_LOCAL.value,
                 post_scan=True,
             )
+            license_expression_spdx = build_spdx_license_expression(
+                license_expression=str(license_expression),
+                licensing=get_cache().licensing,
+            )
             license_detection_mapping["license_expression"] = str(license_expression)
+            license_detection_mapping["license_expression_spdx"] = str(license_expression_spdx)
             license_detection_mapping["detection_log"] = detection_log
             license_detection_mapping["identifier"] = get_new_identifier_from_detections(
                 initial_detection=license_detection_mapping,
@@ -253,7 +258,12 @@ def add_referenced_license_detection_from_package(resource, codebase):
             analysis=analysis,
             post_scan=True,
         )
+        license_expression_spdx = build_spdx_license_expression(
+            license_expression=str(license_expression),
+            licensing=get_cache().licensing,
+        )
         license_detection_mapping["license_expression"] = str(license_expression)
+        license_detection_mapping["license_expression_spdx"] = str(license_expression_spdx)
         license_detection_mapping["detection_log"] = detection_log
         license_detection_mapping["identifier"] = get_new_identifier_from_detections(
             initial_detection=license_detection_mapping,
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
index e2c3cc214f5..2fe57fecb11 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_1_1-1712efcb-d696-b5e4-214d-b2ab69680c2a",
       "license_expression": "apache-1.1",
+      "license_expression_spdx": "Apache-1.1",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-1.1",
+          "license_expression_spdx": "Apache-1.1",
           "rule_identifier": "apache-1.1_63.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE",
@@ -47,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "apache-1.1",
+          "license_expression_spdx": "Apache-1.1",
           "matches": [
             {
               "score": 96.07,
@@ -57,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-1.1",
+              "spdx_license_expression": "Apache-1.1",
               "rule_identifier": "apache-1.1_63.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
index 61ae35898ea..24678fabc16 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
@@ -3,6 +3,7 @@
     {
       "identifier": "pygres_2_2-04f085e8-3db1-f9e2-8dde-7ba8a7ba619a",
       "license_expression": "pygres-2.2",
+      "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "pygres-2.2",
+          "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
           "rule_identifier": "pygres-2.2_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE",
@@ -47,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "pygres-2.2",
+          "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
           "matches": [
             {
               "score": 100.0,
@@ -57,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "pygres-2.2",
+              "spdx_license_expression": "LicenseRef-scancode-pygres-2.2",
               "rule_identifier": "pygres-2.2_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
index 508a3452189..4da66d4bd5d 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
@@ -3,6 +3,7 @@
     {
       "identifier": "pcre-c61d8210-7748-d787-5e3e-fd64c6cd6b6a",
       "license_expression": "pcre",
+      "license_expression_spdx": "LicenseRef-scancode-pcre",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "pcre",
+          "license_expression_spdx": "LicenseRef-scancode-pcre",
           "rule_identifier": "pcre.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE",
@@ -47,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "pcre",
+          "license_expression_spdx": "LicenseRef-scancode-pcre",
           "matches": [
             {
               "score": 100.0,
@@ -57,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "pcre",
+              "spdx_license_expression": "LicenseRef-scancode-pcre",
               "rule_identifier": "pcre.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json
index 85d3913d23c..a91d319351c 100644
--- a/tests/formattedcode/data/common/manifests-expected.json
+++ b/tests/formattedcode/data/common/manifests-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "cddl-1.0",
+          "license_expression_spdx": "CDDL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
               "rule_identifier": "cddl-1.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -53,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
               "rule_identifier": "cddl-1.0_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -122,6 +125,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -132,6 +136,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -142,6 +147,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -152,6 +158,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -217,6 +224,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -227,6 +235,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -472,6 +481,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -483,6 +493,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -493,6 +504,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -504,6 +516,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -514,6 +527,7 @@
     {
       "identifier": "cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6",
       "license_expression": "cddl-1.0",
+      "license_expression_spdx": "CDDL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -525,6 +539,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_72.RULE",
           "rule_relevance": 16,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE",
@@ -539,6 +554,7 @@
           "match_coverage": 82.35,
           "matcher": "3-seq",
           "license_expression": "cddl-1.0",
+          "license_expression_spdx": "CDDL-1.0",
           "rule_identifier": "cddl-1.0_32.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE",
@@ -549,6 +565,7 @@
     {
       "identifier": "cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880",
       "license_expression": "cddl-1.0",
+      "license_expression_spdx": "CDDL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -560,6 +577,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "license_expression_spdx": "CDDL-1.0",
           "rule_identifier": "cddl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -574,6 +592,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "license_expression_spdx": "CDDL-1.0",
           "rule_identifier": "cddl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -584,6 +603,7 @@
     {
       "identifier": "lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321",
       "license_expression": "lgpl-3.0",
+      "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -595,6 +615,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
@@ -605,6 +626,7 @@
     {
       "identifier": "lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0",
       "license_expression": "lgpl-3.0",
+      "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -616,6 +638,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_276.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE",
@@ -626,6 +649,7 @@
     {
       "identifier": "lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631",
       "license_expression": "lgpl-3.0",
+      "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -637,6 +661,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_152.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE",
@@ -647,6 +672,7 @@
     {
       "identifier": "lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5",
       "license_expression": "lgpl-3.0",
+      "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -658,6 +684,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_29.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -668,6 +695,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -679,6 +707,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -689,6 +718,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -700,6 +730,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -828,6 +859,7 @@
           "license_detections": [
             {
               "license_expression": "cddl-1.0",
+              "license_expression_spdx": "CDDL-1.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -838,6 +870,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "cddl-1.0",
+                  "spdx_license_expression": "CDDL-1.0",
                   "rule_identifier": "cddl-1.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -852,6 +885,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "cddl-1.0",
+                  "spdx_license_expression": "CDDL-1.0",
                   "rule_identifier": "cddl-1.0_4.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -887,6 +921,7 @@
       "license_detections": [
         {
           "license_expression": "cddl-1.0",
+          "license_expression_spdx": "CDDL-1.0",
           "matches": [
             {
               "score": 16.0,
@@ -897,6 +932,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_72.RULE",
               "rule_relevance": 16,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
@@ -910,6 +946,7 @@
               "match_coverage": 82.35,
               "matcher": "3-seq",
               "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
               "rule_identifier": "cddl-1.0_32.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
@@ -1021,6 +1058,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1031,6 +1069,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -1041,6 +1080,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1051,6 +1091,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -1185,6 +1226,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1195,6 +1237,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -1204,6 +1247,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1214,6 +1258,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -1329,6 +1374,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1339,6 +1385,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1423,6 +1470,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1433,6 +1481,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -1552,6 +1601,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0",
+              "license_expression_spdx": "LGPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1562,6 +1612,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
                   "rule_identifier": "lgpl-3.0_29.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -1572,6 +1623,7 @@
             },
             {
               "license_expression": "lgpl-3.0",
+              "license_expression_spdx": "LGPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1582,6 +1634,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
                   "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
@@ -1724,6 +1777,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1734,6 +1788,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_276.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
@@ -1743,6 +1798,7 @@
         },
         {
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1753,6 +1809,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_152.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
@@ -1762,6 +1819,7 @@
         },
         {
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1772,6 +1830,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines
index 70cdc5629d3..f02a3c53198 100644
--- a/tests/formattedcode/data/common/manifests-expected.jsonlines
+++ b/tests/formattedcode/data/common/manifests-expected.jsonlines
@@ -61,6 +61,7 @@
         "license_detections": [
           {
             "license_expression": "cddl-1.0",
+            "license_expression_spdx": "CDDL-1.0",
             "matches": [
               {
                 "score": 100.0,
@@ -71,6 +72,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
                 "rule_identifier": "cddl-1.0.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -85,6 +87,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
                 "rule_identifier": "cddl-1.0_4.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -154,6 +157,7 @@
         "license_detections": [
           {
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
                 "score": 100.0,
@@ -164,6 +168,7 @@
                 "match_coverage": 100.0,
                 "matcher": "1-hash",
                 "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
                 "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -174,6 +179,7 @@
           },
           {
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
                 "score": 100.0,
@@ -184,6 +190,7 @@
                 "match_coverage": 100.0,
                 "matcher": "1-hash",
                 "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
                 "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -249,6 +256,7 @@
         "license_detections": [
           {
             "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "matches": [
               {
                 "score": 100.0,
@@ -259,6 +267,7 @@
                 "match_coverage": 100.0,
                 "matcher": "1-spdx-id",
                 "license_expression": "mit",
+                "spdx_license_expression": "MIT",
                 "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                 "rule_relevance": 100,
                 "rule_url": null,
@@ -508,6 +517,7 @@
       {
         "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "detection_count": 3,
         "sample_matches": [
           {
@@ -519,6 +529,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -529,6 +540,7 @@
       {
         "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -540,6 +552,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "rule_identifier": "apache-2.0_65.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -550,6 +563,7 @@
       {
         "identifier": "cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6",
         "license_expression": "cddl-1.0",
+        "license_expression_spdx": "CDDL-1.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -561,6 +575,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "unknown-license-reference",
+            "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
             "rule_identifier": "license-intro_72.RULE",
             "rule_relevance": 16,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE",
@@ -575,6 +590,7 @@
             "match_coverage": 82.35,
             "matcher": "3-seq",
             "license_expression": "cddl-1.0",
+            "license_expression_spdx": "CDDL-1.0",
             "rule_identifier": "cddl-1.0_32.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE",
@@ -585,6 +601,7 @@
       {
         "identifier": "cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880",
         "license_expression": "cddl-1.0",
+        "license_expression_spdx": "CDDL-1.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -596,6 +613,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "cddl-1.0",
+            "license_expression_spdx": "CDDL-1.0",
             "rule_identifier": "cddl-1.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -610,6 +628,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "cddl-1.0",
+            "license_expression_spdx": "CDDL-1.0",
             "rule_identifier": "cddl-1.0_4.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -620,6 +639,7 @@
       {
         "identifier": "lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321",
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 2,
         "sample_matches": [
           {
@@ -631,6 +651,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
@@ -641,6 +662,7 @@
       {
         "identifier": "lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0",
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -652,6 +674,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "rule_identifier": "lgpl-3.0_276.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE",
@@ -662,6 +685,7 @@
       {
         "identifier": "lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631",
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -673,6 +697,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "rule_identifier": "lgpl-3.0_152.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE",
@@ -683,6 +708,7 @@
       {
         "identifier": "lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5",
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -694,6 +720,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "rule_identifier": "lgpl-3.0_29.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -704,6 +731,7 @@
       {
         "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -715,6 +743,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -725,6 +754,7 @@
       {
         "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -736,6 +766,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -874,6 +905,7 @@
             "license_detections": [
               {
                 "license_expression": "cddl-1.0",
+                "license_expression_spdx": "CDDL-1.0",
                 "matches": [
                   {
                     "score": 100.0,
@@ -884,6 +916,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "cddl-1.0",
+                    "spdx_license_expression": "CDDL-1.0",
                     "rule_identifier": "cddl-1.0.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -898,6 +931,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "cddl-1.0",
+                    "spdx_license_expression": "CDDL-1.0",
                     "rule_identifier": "cddl-1.0_4.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
@@ -933,6 +967,7 @@
         "license_detections": [
           {
             "license_expression": "cddl-1.0",
+            "license_expression_spdx": "CDDL-1.0",
             "matches": [
               {
                 "score": 16.0,
@@ -943,6 +978,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "unknown-license-reference",
+                "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                 "rule_identifier": "license-intro_72.RULE",
                 "rule_relevance": 16,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
@@ -956,6 +992,7 @@
                 "match_coverage": 82.35,
                 "matcher": "3-seq",
                 "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
                 "rule_identifier": "cddl-1.0_32.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
@@ -1075,6 +1112,7 @@
             "license_detections": [
               {
                 "license_expression": "apache-2.0",
+                "license_expression_spdx": "Apache-2.0",
                 "matches": [
                   {
                     "score": 100.0,
@@ -1085,6 +1123,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "apache-2.0",
+                    "spdx_license_expression": "Apache-2.0",
                     "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -1095,6 +1134,7 @@
               },
               {
                 "license_expression": "apache-2.0",
+                "license_expression_spdx": "Apache-2.0",
                 "matches": [
                   {
                     "score": 100.0,
@@ -1105,6 +1145,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "apache-2.0",
+                    "spdx_license_expression": "Apache-2.0",
                     "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -1239,6 +1280,7 @@
         "license_detections": [
           {
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
                 "score": 100.0,
@@ -1249,6 +1291,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
                 "rule_identifier": "apache-2.0_65.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -1258,6 +1301,7 @@
           },
           {
             "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
                 "score": 100.0,
@@ -1268,6 +1312,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
                 "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -1391,6 +1436,7 @@
             "license_detections": [
               {
                 "license_expression": "mit",
+                "license_expression_spdx": "MIT",
                 "matches": [
                   {
                     "score": 100.0,
@@ -1401,6 +1447,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-spdx-id",
                     "license_expression": "mit",
+                    "spdx_license_expression": "MIT",
                     "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                     "rule_relevance": 100,
                     "rule_url": null,
@@ -1485,6 +1532,7 @@
         "license_detections": [
           {
             "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "matches": [
               {
                 "score": 100.0,
@@ -1495,6 +1543,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "mit",
+                "spdx_license_expression": "MIT",
                 "rule_identifier": "mit_30.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -1622,6 +1671,7 @@
             "license_detections": [
               {
                 "license_expression": "lgpl-3.0",
+                "license_expression_spdx": "LGPL-3.0-only",
                 "matches": [
                   {
                     "score": 100.0,
@@ -1632,6 +1682,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "lgpl-3.0",
+                    "spdx_license_expression": "LGPL-3.0-only",
                     "rule_identifier": "lgpl-3.0_29.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -1642,6 +1693,7 @@
               },
               {
                 "license_expression": "lgpl-3.0",
+                "license_expression_spdx": "LGPL-3.0-only",
                 "matches": [
                   {
                     "score": 100.0,
@@ -1652,6 +1704,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "lgpl-3.0",
+                    "spdx_license_expression": "LGPL-3.0-only",
                     "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
@@ -1794,6 +1847,7 @@
         "license_detections": [
           {
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
                 "score": 100.0,
@@ -1804,6 +1858,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
                 "rule_identifier": "lgpl-3.0_276.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
@@ -1813,6 +1868,7 @@
           },
           {
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
                 "score": 100.0,
@@ -1823,6 +1879,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
                 "rule_identifier": "lgpl-3.0_152.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
@@ -1832,6 +1889,7 @@
           },
           {
             "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
                 "score": 100.0,
@@ -1842,6 +1900,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
                 "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml
index ebf82f29f33..e37e52541b7 100644
--- a/tests/formattedcode/data/common/manifests-expected.yaml
+++ b/tests/formattedcode/data/common/manifests-expected.yaml
@@ -92,6 +92,7 @@ packages:
     declared_license_expression_spdx: CDDL-1.0
     license_detections:
       - license_expression: cddl-1.0
+        license_expression_spdx: CDDL-1.0
         matches:
           - score: '100.0'
             start_line: 1
@@ -101,6 +102,7 @@ packages:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
             rule_identifier: cddl-1.0.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE
@@ -113,6 +115,7 @@ packages:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
             rule_identifier: cddl-1.0_4.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
@@ -170,6 +173,7 @@ packages:
     declared_license_expression_spdx: Apache-2.0
     license_detections:
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 1
@@ -179,12 +183,14 @@ packages:
             match_coverage: '100.0'
             matcher: 1-hash
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
             matched_text: Apache-2.0
         identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 1
@@ -194,6 +200,7 @@ packages:
             match_coverage: '100.0'
             matcher: 1-hash
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
@@ -250,6 +257,7 @@ packages:
     declared_license_expression_spdx: MIT
     license_detections:
       - license_expression: mit
+        license_expression_spdx: MIT
         matches:
           - score: '100.0'
             start_line: 1
@@ -259,6 +267,7 @@ packages:
             match_coverage: '100.0'
             matcher: 1-spdx-id
             license_expression: mit
+            spdx_license_expression: MIT
             rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
             rule_relevance: 100
             rule_url:
@@ -465,6 +474,7 @@ dependencies:
 license_detections:
   - identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
     license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     detection_count: 3
     sample_matches:
       - score: '100.0'
@@ -475,12 +485,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
         matched_text: '        "type": "Apache 2.0",'
   - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
     license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -491,12 +503,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         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",'
   - identifier: cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6
     license_expression: cddl-1.0
+    license_expression_spdx: CDDL-1.0
     detection_count: 1
     sample_matches:
       - score: '16.0'
@@ -507,6 +521,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unknown-license-reference
+        license_expression_spdx: LicenseRef-scancode-unknown-license-reference
         rule_identifier: license-intro_72.RULE
         rule_relevance: 16
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE
@@ -522,6 +537,7 @@ license_detections:
         match_coverage: '82.35'
         matcher: 3-seq
         license_expression: cddl-1.0
+        license_expression_spdx: CDDL-1.0
         rule_identifier: cddl-1.0_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE
@@ -531,6 +547,7 @@ license_detections:
             http://www.sun.com/cddl/cddl.html
   - identifier: cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880
     license_expression: cddl-1.0
+    license_expression_spdx: CDDL-1.0
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -541,6 +558,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cddl-1.0
+        license_expression_spdx: CDDL-1.0
         rule_identifier: cddl-1.0.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE
@@ -553,12 +571,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cddl-1.0
+        license_expression_spdx: CDDL-1.0
         rule_identifier: cddl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
         matched_text: '  url: http://www.sun.com/cddl/cddl.html'
   - identifier: lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321
     license_expression: lgpl-3.0
+    license_expression_spdx: LGPL-3.0-only
     detection_count: 2
     sample_matches:
       - score: '100.0'
@@ -569,6 +589,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
@@ -577,6 +598,7 @@ license_detections:
           'License v3 (LGPLv3)',
   - identifier: lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0
     license_expression: lgpl-3.0
+    license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -587,6 +609,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         rule_identifier: lgpl-3.0_276.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE
@@ -605,6 +628,7 @@ license_detections:
           51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   - identifier: lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631
     license_expression: lgpl-3.0
+    license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -615,12 +639,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         rule_identifier: lgpl-3.0_152.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE
         matched_text: '    license="LGPLv3",'
   - identifier: lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5
     license_expression: lgpl-3.0
+    license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -631,12 +657,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         rule_identifier: lgpl-3.0_29.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE
         matched_text: LGPLv3
   - identifier: mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee
     license_expression: mit
+    license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -647,12 +675,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        license_expression_spdx: MIT
         rule_identifier: mit_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE
         matched_text: '    "license": "MIT",'
   - identifier: mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf
     license_expression: mit
+    license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -663,6 +693,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-spdx-id
         license_expression: mit
+        license_expression_spdx: MIT
         rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
         rule_relevance: 100
         rule_url:
@@ -1721,6 +1752,7 @@ files:
         declared_license_expression_spdx: CDDL-1.0
         license_detections:
           - license_expression: cddl-1.0
+            license_expression_spdx: CDDL-1.0
             matches:
               - score: '100.0'
                 start_line: 1
@@ -1730,6 +1762,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 2-aho
                 license_expression: cddl-1.0
+                spdx_license_expression: CDDL-1.0
                 rule_identifier: cddl-1.0.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE
@@ -1742,6 +1775,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 2-aho
                 license_expression: cddl-1.0
+                spdx_license_expression: CDDL-1.0
                 rule_identifier: cddl-1.0_4.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
@@ -1775,6 +1809,7 @@ files:
     detected_license_expression_spdx: CDDL-1.0
     license_detections:
       - license_expression: cddl-1.0
+        license_expression_spdx: CDDL-1.0
         matches:
           - score: '16.0'
             start_line: 17
@@ -1784,6 +1819,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: unknown-license-reference
+            spdx_license_expression: LicenseRef-scancode-unknown-license-reference
             rule_identifier: license-intro_72.RULE
             rule_relevance: 16
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE
@@ -1799,6 +1835,7 @@ files:
             match_coverage: '82.35'
             matcher: 3-seq
             license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
             rule_identifier: cddl-1.0_32.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE
@@ -1915,6 +1952,7 @@ files:
         declared_license_expression_spdx: Apache-2.0
         license_detections:
           - license_expression: apache-2.0
+            license_expression_spdx: Apache-2.0
             matches:
               - score: '100.0'
                 start_line: 1
@@ -1924,12 +1962,14 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-hash
                 license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
                 rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 matched_text: Apache-2.0
             identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
           - license_expression: apache-2.0
+            license_expression_spdx: Apache-2.0
             matches:
               - score: '100.0'
                 start_line: 1
@@ -1939,6 +1979,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-hash
                 license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
                 rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
@@ -2052,6 +2093,7 @@ files:
     detected_license_expression_spdx: Apache-2.0
     license_detections:
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 6
@@ -2061,12 +2103,14 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: apache-2.0_65.RULE
             rule_relevance: 100
             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",'
         identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 20
@@ -2076,6 +2120,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
@@ -2200,6 +2245,7 @@ files:
         declared_license_expression_spdx: MIT
         license_detections:
           - license_expression: mit
+            license_expression_spdx: MIT
             matches:
               - score: '100.0'
                 start_line: 1
@@ -2209,6 +2255,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-spdx-id
                 license_expression: mit
+                spdx_license_expression: MIT
                 rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
                 rule_relevance: 100
                 rule_url:
@@ -2280,6 +2327,7 @@ files:
     detected_license_expression_spdx: MIT
     license_detections:
       - license_expression: mit
+        license_expression_spdx: MIT
         matches:
           - score: '100.0'
             start_line: 4
@@ -2289,6 +2337,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: mit
+            spdx_license_expression: MIT
             rule_identifier: mit_30.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE
@@ -2419,6 +2468,7 @@ files:
         declared_license_expression_spdx: LGPL-3.0-only
         license_detections:
           - license_expression: lgpl-3.0
+            license_expression_spdx: LGPL-3.0-only
             matches:
               - score: '100.0'
                 start_line: 1
@@ -2428,12 +2478,14 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-hash
                 license_expression: lgpl-3.0
+                spdx_license_expression: LGPL-3.0-only
                 rule_identifier: lgpl-3.0_29.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE
                 matched_text: LGPLv3
             identifier: lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5
           - license_expression: lgpl-3.0
+            license_expression_spdx: LGPL-3.0-only
             matches:
               - score: '100.0'
                 start_line: 1
@@ -2443,6 +2495,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-hash
                 license_expression: lgpl-3.0
+                spdx_license_expression: LGPL-3.0-only
                 rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
@@ -2564,6 +2617,7 @@ files:
     detected_license_expression_spdx: LGPL-3.0-only
     license_detections:
       - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         matches:
           - score: '100.0'
             start_line: 9
@@ -2573,6 +2627,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
             rule_identifier: lgpl-3.0_276.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE
@@ -2591,6 +2646,7 @@ files:
               51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
         identifier: lgpl_3_0-121be3c2-9c80-df84-d3da-8f674e4125c0
       - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         matches:
           - score: '100.0'
             start_line: 65
@@ -2600,12 +2656,14 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
             rule_identifier: lgpl-3.0_152.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE
             matched_text: '    license="LGPLv3",'
         identifier: lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631
       - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         matches:
           - score: '100.0'
             start_line: 74
@@ -2615,6 +2673,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
             rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index d8d026d4cef..f40143b0c41 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,20 +1,20 @@
-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__score,start_line,end_line,license_match__from_file,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__rule_identifier,license_match__rule_relevance,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__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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,,100.00,5,13,scan/json2csv.rb,85,100.00,2-aho,apache-2.0,apache-2.0_7.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,100.00,1,12,scan/license,113,100.00,1-hash,gpl-2.0-plus,gpl-2.0-plus_420.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,scan/package.json,3,100.00,2-aho,mit,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,scan/package.json,136,85.53,3-seq,mit,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-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', 'matches': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, '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
+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__score,start_line,end_line,license_match__from_file,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__spdx_license_expression,license_match__rule_identifier,license_match__rule_relevance,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__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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,,100.00,5,13,scan/json2csv.rb,85,100.00,2-aho,apache-2.0,Apache-2.0,apache-2.0_7.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,100.00,1,12,scan/license,113,100.00,1-hash,gpl-2.0-plus,GPL-2.0-or-later,gpl-2.0-plus_420.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,scan/package.json,3,100.00,2-aho,mit,MIT,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,scan/package.json,136,85.53,3-seq,mit,MIT,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+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': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, '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 9c6abf1a868..68486425d69 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__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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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 87bbd9060ed..963bef3f80b 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__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', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
index 3d99d8fab81..0a1d4ed225f 100644
--- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
+++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
@@ -88,6 +88,7 @@ packages:
     declared_license_expression_spdx: Apache-2.0
     license_detections:
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 1
@@ -97,6 +98,7 @@ packages:
             match_coverage: '100.0'
             matcher: 1-hash
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
@@ -122,6 +124,7 @@ dependencies: []
 license_detections:
   - identifier: apache_2_0-ab23f79b-ec38-9a8a-9b23-85059407f34d
     license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -132,6 +135,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: apache-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE
@@ -276,6 +280,7 @@ license_detections:
           \ language governing permissions and\n   limitations under the License."
   - identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
     license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -286,12 +291,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
         matched_text: Apache-2.0
   - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
     license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -302,12 +309,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         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
   - identifier: apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39
     license_expression: apache-2.0 AND (apache-2.0 OR mit)
+    license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
     detection_count: 1
     sample_matches:
       - score: '80.0'
@@ -318,6 +327,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         rule_identifier: apache-2.0_73.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE
@@ -330,12 +340,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0 OR mit
+        license_expression_spdx: Apache-2.0 OR MIT
         rule_identifier: apache-2.0_or_mit_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE
         matched_text: This is licensed under Apache-2.0 or MIT
   - identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
     license_expression: mit
+    license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
       - score: '100.0'
@@ -346,6 +358,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        license_expression_spdx: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1042,6 +1055,7 @@ files:
     detected_license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
     license_detections:
       - license_expression: apache-2.0 AND (apache-2.0 OR mit)
+        license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
         matches:
           - score: '80.0'
             start_line: 3
@@ -1051,6 +1065,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: apache-2.0_73.RULE
             rule_relevance: 80
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE
@@ -1063,6 +1078,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: apache-2.0 OR mit
+            spdx_license_expression: Apache-2.0 OR MIT
             rule_identifier: apache-2.0_or_mit_36.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE
@@ -1115,6 +1131,7 @@ files:
     detected_license_expression_spdx: Apache-2.0
     license_detections:
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 2
@@ -1124,6 +1141,7 @@ files:
             match_coverage: '100.0'
             matcher: 1-hash
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: apache-2.0.LICENSE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE
@@ -1322,6 +1340,7 @@ files:
     detected_license_expression_spdx: MIT
     license_detections:
       - license_expression: mit
+        license_expression_spdx: MIT
         matches:
           - score: '100.0'
             start_line: 2
@@ -1331,6 +1350,7 @@ files:
             match_coverage: '100.0'
             matcher: 1-hash
             license_expression: mit
+            spdx_license_expression: MIT
             rule_identifier: mit.LICENSE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1416,6 +1436,7 @@ files:
         declared_license_expression_spdx: Apache-2.0
         license_detections:
           - license_expression: apache-2.0
+            license_expression_spdx: Apache-2.0
             matches:
               - score: '100.0'
                 start_line: 1
@@ -1425,6 +1446,7 @@ files:
                 match_coverage: '100.0'
                 matcher: 1-hash
                 license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
                 rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
@@ -1455,6 +1477,7 @@ files:
     detected_license_expression_spdx: Apache-2.0
     license_detections:
       - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         matches:
           - score: '100.0'
             start_line: 4
@@ -1464,6 +1487,7 @@ files:
             match_coverage: '100.0'
             matcher: 2-aho
             license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
             rule_identifier: apache-2.0_65.RULE
             rule_relevance: 100
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
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 bffb2a81ae0..db979292f3d 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
@@ -3,6 +3,7 @@
     {
       "identifier": "example_installed_1_and_example_installed_2_and_example1_and_example2_and_apache_2_0-cfa2fe66-d37a-6bee-465f-3d11802e1c1d",
       "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0",
+      "license_expression_spdx": "scancode-example-installed1 AND LicenseRef-scancode-example-installed2 AND scancode-example1 AND scancode-example2 AND Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example-installed-1",
+          "license_expression_spdx": "scancode-example-installed1",
           "rule_identifier": "example-installed-1.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -28,6 +30,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example-installed-2",
+          "license_expression_spdx": "LicenseRef-scancode-example-installed2",
           "rule_identifier": "example-installed-2.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -42,6 +45,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example1",
+          "license_expression_spdx": "scancode-example1",
           "rule_identifier": "example1.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -56,6 +60,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example2",
+          "license_expression_spdx": "scancode-example2",
           "rule_identifier": "example2.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -70,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -403,6 +409,7 @@
       "license_detections": [
         {
           "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0",
+          "license_expression_spdx": "scancode-example-installed1 AND LicenseRef-scancode-example-installed2 AND scancode-example1 AND scancode-example2 AND Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -413,6 +420,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example-installed-1",
+              "spdx_license_expression": "scancode-example-installed1",
               "rule_identifier": "example-installed-1.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
@@ -426,6 +434,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example-installed-2",
+              "spdx_license_expression": "LicenseRef-scancode-example-installed2",
               "rule_identifier": "example-installed-2.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
@@ -439,6 +448,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example1",
+              "spdx_license_expression": "scancode-example1",
               "rule_identifier": "example1.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
@@ -452,6 +462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example2",
+              "spdx_license_expression": "scancode-example2",
               "rule_identifier": "example2.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
@@ -465,6 +476,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
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 1e4923eb95a..b5544b71cdb 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
@@ -3,6 +3,7 @@
     {
       "identifier": "example1_and_example2-f86ebb61-26dd-be05-2a61-01d7b630ba62",
       "license_expression": "example1 AND example2",
+      "license_expression_spdx": "scancode-example1 AND scancode-example2",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example1",
+          "license_expression_spdx": "scancode-example1",
           "rule_identifier": "example1.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -28,6 +30,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "example2",
+          "license_expression_spdx": "scancode-example2",
           "rule_identifier": "example2.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -169,6 +172,7 @@
       "license_detections": [
         {
           "license_expression": "example1 AND example2",
+          "license_expression_spdx": "scancode-example1 AND scancode-example2",
           "matches": [
             {
               "score": 100.0,
@@ -179,6 +183,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example1",
+              "spdx_license_expression": "scancode-example1",
               "rule_identifier": "example1.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
@@ -192,6 +197,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "example2",
+              "spdx_license_expression": "scancode-example2",
               "rule_identifier": "example2.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
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 341dd389d9e..e34365dbf0c 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
@@ -3,6 +3,7 @@
     {
       "identifier": "example_installed_1-ec26d04a-f591-6524-a28f-b2c6b6d5086a",
       "license_expression": "example-installed-1",
+      "license_expression_spdx": "scancode-example-installed1",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "example-installed-1",
+          "license_expression_spdx": "scancode-example-installed1",
           "rule_identifier": "example-installed-1.LICENSE",
           "rule_relevance": 100,
           "rule_url": null,
@@ -95,6 +97,7 @@
       "license_detections": [
         {
           "license_expression": "example-installed-1",
+          "license_expression_spdx": "scancode-example-installed1",
           "matches": [
             {
               "score": 100.0,
@@ -105,6 +108,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "example-installed-1",
+              "spdx_license_expression": "scancode-example-installed1",
               "rule_identifier": "example-installed-1.LICENSE",
               "rule_relevance": 100,
               "rule_url": null
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 3fbca23dba4..e1cbeb7b057 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
@@ -3,6 +3,7 @@
     {
       "identifier": "bsd_new-35c287f1-5d41-52f8-399e-2391cd1b4b40",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_943.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE",
@@ -25,6 +27,7 @@
     {
       "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_19.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -47,6 +51,7 @@
     {
       "identifier": "bzip2_libbzip_2010-7158bcb2-a4d7-9815-17d2-1b1d0a6d5de2",
       "license_expression": "bzip2-libbzip-2010",
+      "license_expression_spdx": "bzip2-1.0.6",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -61,6 +66,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -75,6 +81,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bzip2-libbzip-2010",
+          "license_expression_spdx": "bzip2-1.0.6",
           "rule_identifier": "bzip2-libbzip-2010.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
@@ -85,6 +92,7 @@
     {
       "identifier": "openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621",
       "license_expression": "openssl",
+      "license_expression_spdx": "LicenseRef-scancode-openssl",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -97,6 +105,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "openssl",
+          "license_expression_spdx": "LicenseRef-scancode-openssl",
           "rule_identifier": "openssl_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE",
@@ -107,6 +116,7 @@
     {
       "identifier": "openssl_ssleay-238ad05e-bfde-df4c-6b5b-61ef3ec16843",
       "license_expression": "openssl-ssleay",
+      "license_expression_spdx": "OpenSSL",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -121,6 +131,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -135,6 +146,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "rule_identifier": "openssl-ssleay_43.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE",
@@ -149,6 +161,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "rule_identifier": "openssl-ssleay_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE",
@@ -159,6 +172,7 @@
     {
       "identifier": "other_copyleft_and_gpl_1_0_plus-2a634b9a-02ad-d5b9-47fc-e91c5eb24808",
       "license_expression": "other-copyleft AND gpl-1.0-plus",
+      "license_expression_spdx": "LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -171,6 +185,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -185,6 +200,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_200.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_200.RULE",
@@ -199,6 +215,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -213,6 +230,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -227,6 +245,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -241,6 +260,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_194.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_194.RULE",
@@ -255,6 +275,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -269,6 +290,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -279,6 +301,7 @@
     {
       "identifier": "python-c496ccae-69a0-c5f8-a742-83bcd66bfe68",
       "license_expression": "python",
+      "license_expression_spdx": "Python-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -291,6 +314,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "python",
+          "license_expression_spdx": "Python-2.0",
           "rule_identifier": "python_not_not-a-license_269.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_not_not-a-license_269.RULE",
@@ -301,6 +325,7 @@
     {
       "identifier": "python_and_python_cwi-dda7296c-6bc9-a87c-6fcd-8aa47c3484dc",
       "license_expression": "python AND python-cwi",
+      "license_expression_spdx": "Python-2.0 AND LicenseRef-scancode-python-cwi",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -313,6 +338,7 @@
           "match_coverage": 90.52,
           "matcher": "3-seq",
           "license_expression": "python",
+          "license_expression_spdx": "Python-2.0",
           "rule_identifier": "python_2019.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_2019.RULE",
@@ -327,6 +353,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "python-cwi",
+          "license_expression_spdx": "LicenseRef-scancode-python-cwi",
           "rule_identifier": "python-cwi.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/python-cwi.LICENSE",
@@ -337,6 +364,7 @@
     {
       "identifier": "sleepycat-a7cd8833-ecc2-8ade-54d7-392befcce801",
       "license_expression": "sleepycat",
+      "license_expression_spdx": "Sleepycat",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -351,6 +379,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -365,6 +394,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "sleepycat",
+          "license_expression_spdx": "Sleepycat",
           "rule_identifier": "sleepycat_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_5.RULE",
@@ -375,6 +405,7 @@
     {
       "identifier": "ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a",
       "license_expression": "ssleay-windows",
+      "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -387,6 +418,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "ssleay-windows",
+          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
           "rule_identifier": "ssleay-windows.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE",
@@ -397,6 +429,7 @@
     {
       "identifier": "tcl-75d8de8c-9cf0-d604-4b99-e03436ebfcd3",
       "license_expression": "tcl",
+      "license_expression_spdx": "TCL",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -411,6 +444,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -425,6 +459,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "rule_identifier": "tcl_14.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE",
@@ -435,6 +470,7 @@
     {
       "identifier": "tcl-d865b2e8-435b-c54f-f19d-66d165a889ac",
       "license_expression": "tcl",
+      "license_expression_spdx": "TCL",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -449,6 +485,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -463,6 +500,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "rule_identifier": "tcl.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tcl.LICENSE",
@@ -1578,6 +1616,7 @@
       "license_detections": [
         {
           "license_expression": "python",
+          "license_expression_spdx": "Python-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1588,6 +1627,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "python",
+              "spdx_license_expression": "Python-2.0",
               "rule_identifier": "python_not_not-a-license_269.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_not_not-a-license_269.RULE",
@@ -1599,6 +1639,7 @@
         },
         {
           "license_expression": "other-copyleft AND gpl-1.0-plus",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 80.0,
@@ -1609,6 +1650,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
               "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -1623,6 +1665,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_200.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_200.RULE",
@@ -1637,6 +1680,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -1651,6 +1695,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -1665,6 +1710,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
               "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -1679,6 +1725,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_194.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_194.RULE",
@@ -1693,6 +1740,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
               "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
@@ -1707,6 +1755,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
@@ -1718,6 +1767,7 @@
         },
         {
           "license_expression": "python AND python-cwi",
+          "license_expression_spdx": "Python-2.0 AND LicenseRef-scancode-python-cwi",
           "matches": [
             {
               "score": 90.52,
@@ -1728,6 +1778,7 @@
               "match_coverage": 90.52,
               "matcher": "3-seq",
               "license_expression": "python",
+              "spdx_license_expression": "Python-2.0",
               "rule_identifier": "python_2019.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_2019.RULE",
@@ -1742,6 +1793,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "python-cwi",
+              "spdx_license_expression": "LicenseRef-scancode-python-cwi",
               "rule_identifier": "python-cwi.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/python-cwi.LICENSE",
@@ -1753,6 +1805,7 @@
         },
         {
           "license_expression": "bzip2-libbzip-2010",
+          "license_expression_spdx": "bzip2-1.0.6",
           "matches": [
             {
               "score": 100.0,
@@ -1763,6 +1816,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -1777,6 +1831,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bzip2-libbzip-2010",
+              "spdx_license_expression": "bzip2-1.0.6",
               "rule_identifier": "bzip2-libbzip-2010.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
@@ -1790,6 +1845,7 @@
         },
         {
           "license_expression": "sleepycat",
+          "license_expression_spdx": "Sleepycat",
           "matches": [
             {
               "score": 100.0,
@@ -1800,6 +1856,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -1814,6 +1871,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "sleepycat",
+              "spdx_license_expression": "Sleepycat",
               "rule_identifier": "sleepycat_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_5.RULE",
@@ -1827,6 +1885,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1837,6 +1896,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -1848,6 +1908,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1858,6 +1919,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_943.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE",
@@ -1869,6 +1931,7 @@
         },
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -1879,6 +1942,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -1893,6 +1957,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "openssl-ssleay_43.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE",
@@ -1907,6 +1972,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "openssl-ssleay_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE",
@@ -1920,6 +1986,7 @@
         },
         {
           "license_expression": "openssl",
+          "license_expression_spdx": "LicenseRef-scancode-openssl",
           "matches": [
             {
               "score": 100.0,
@@ -1930,6 +1997,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "openssl",
+              "spdx_license_expression": "LicenseRef-scancode-openssl",
               "rule_identifier": "openssl_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE",
@@ -1941,6 +2009,7 @@
         },
         {
           "license_expression": "ssleay-windows",
+          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
           "matches": [
             {
               "score": 100.0,
@@ -1951,6 +2020,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "ssleay-windows",
+              "spdx_license_expression": "LicenseRef-scancode-ssleay-windows",
               "rule_identifier": "ssleay-windows.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE",
@@ -1962,6 +2032,7 @@
         },
         {
           "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "matches": [
             {
               "score": 100.0,
@@ -1972,6 +2043,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -1986,6 +2058,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "tcl",
+              "spdx_license_expression": "TCL",
               "rule_identifier": "tcl.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tcl.LICENSE",
@@ -1999,6 +2072,7 @@
         },
         {
           "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "matches": [
             {
               "score": 100.0,
@@ -2009,6 +2083,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
@@ -2023,6 +2098,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "tcl",
+              "spdx_license_expression": "TCL",
               "rule_identifier": "tcl_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE",
@@ -2045,6 +2121,7 @@
           "match_coverage": 33.71,
           "matcher": "3-seq",
           "license_expression": "bsd-simplified",
+          "spdx_license_expression": "BSD-2-Clause",
           "rule_identifier": "bsd-simplified_242.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_242.RULE",
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 7de5abe8534..064873dd494 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
@@ -42,6 +42,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0 OR mit",
+          "license_expression_spdx": "Artistic-2.0 OR MIT",
           "matches": [
             {
               "score": 100.0,
@@ -52,6 +53,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "artistic-2.0 OR mit",
+              "spdx_license_expression": "Artistic-2.0 OR MIT",
               "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +88,7 @@
     {
       "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93",
       "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
+      "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -98,6 +101,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -112,6 +116,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit OR bsd-simplified",
+          "license_expression_spdx": "MIT OR BSD-2-Clause",
           "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808",
           "rule_relevance": 100,
           "rule_url": null,
@@ -122,6 +127,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -134,6 +140,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -144,6 +151,7 @@
     {
       "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370",
       "license_expression": "artistic-2.0 OR mit",
+      "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -156,6 +164,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "artistic-2.0 OR mit",
+          "license_expression_spdx": "Artistic-2.0 OR MIT",
           "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_relevance": 100,
           "rule_url": null,
@@ -483,6 +492,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
+          "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
           "matches": [
             {
               "score": 100.0,
@@ -493,6 +503,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -507,6 +518,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit OR bsd-simplified",
+              "spdx_license_expression": "MIT OR BSD-2-Clause",
               "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_relevance": 100,
               "rule_url": null,
@@ -567,6 +579,7 @@
           "license_detections": [
             {
               "license_expression": "artistic-2.0 OR mit",
+              "license_expression_spdx": "Artistic-2.0 OR MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -577,6 +590,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "artistic-2.0 OR mit",
+                  "spdx_license_expression": "Artistic-2.0 OR MIT",
                   "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -610,6 +624,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -620,6 +635,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
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 75a817d8e2d..1986a4fead1 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
@@ -42,6 +42,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0 OR mit",
+          "license_expression_spdx": "Artistic-2.0 OR MIT",
           "matches": [
             {
               "score": 100.0,
@@ -52,6 +53,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "artistic-2.0 OR mit",
+              "spdx_license_expression": "Artistic-2.0 OR MIT",
               "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +88,7 @@
     {
       "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93",
       "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
+      "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -97,6 +100,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -111,6 +115,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit OR bsd-simplified",
+          "license_expression_spdx": "MIT OR BSD-2-Clause",
           "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
           "rule_relevance": 100,
           "rule_url": null,
@@ -121,6 +126,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -132,6 +138,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -142,6 +149,7 @@
     {
       "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370",
       "license_expression": "artistic-2.0 OR mit",
+      "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -153,6 +161,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "artistic-2.0 OR mit",
+          "license_expression_spdx": "Artistic-2.0 OR MIT",
           "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_relevance": 100,
           "rule_url": null,
@@ -480,6 +489,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
+          "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
           "matches": [
             {
               "score": 100.0,
@@ -490,6 +500,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -503,6 +514,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit OR bsd-simplified",
+              "spdx_license_expression": "MIT OR BSD-2-Clause",
               "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_relevance": 100,
               "rule_url": null
@@ -561,6 +573,7 @@
           "license_detections": [
             {
               "license_expression": "artistic-2.0 OR mit",
+              "license_expression_spdx": "Artistic-2.0 OR MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -571,6 +584,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "artistic-2.0 OR mit",
+                  "spdx_license_expression": "Artistic-2.0 OR MIT",
                   "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -604,6 +618,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -614,6 +629,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json
index 0eaac5a9958..9b19afcf9ff 100644
--- a/tests/licensedcode/data/match_spdx/scan-expected.json
+++ b/tests/licensedcode/data/match_spdx/scan-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "mit-86af397f-7fb9-6751-2e09-217685ce5b2a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-158ab4758b53eeb6113d49d57f1d2a094ce67b5b",
           "rule_relevance": 100,
           "rule_url": null,
@@ -32,6 +34,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -42,6 +45,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-6fcd9fa0c61347e06feb569ce3335c1b374640a1",
               "rule_relevance": 100,
               "rule_url": null,
diff --git a/tests/licensedcode/data/match_unknown/unknown-license-expected.json b/tests/licensedcode/data/match_unknown/unknown-license-expected.json
index 19f727639f8..2d555abccd3 100644
--- a/tests/licensedcode/data/match_unknown/unknown-license-expected.json
+++ b/tests/licensedcode/data/match_unknown/unknown-license-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "unknown-b0897d47-1c91-9898-2364-2e4d1a34b6fd",
       "license_expression": "unknown",
+      "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "6-unknown",
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "rule_identifier": "license-detection-unknown-06adbd6a51da0d78de6a51def94b9fa954a6c4f0",
           "rule_relevance": 100,
           "rule_url": null,
@@ -31,6 +33,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 86.89,
@@ -41,6 +44,7 @@
               "match_coverage": 100.0,
               "matcher": "6-unknown",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
               "rule_url": null
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 9aaeed6b20c..721ef1f0959 100644
--- a/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json
+++ b/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "unknown-b0897d47-1c91-9898-2364-2e4d1a34b6fd",
       "license_expression": "unknown",
+      "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
       "detection_log": [
         "unknown-match"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "6-unknown",
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
           "rule_relevance": 100,
           "rule_url": null,
@@ -34,6 +36,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 86.89,
@@ -44,6 +47,7 @@
               "match_coverage": 100.0,
               "matcher": "6-unknown",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
               "rule_url": null,
diff --git a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
index a64164da941..9924c747d35 100644
--- a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
+++ b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_2_0-aef5c472-cdfd-dc5f-c152-40e3d96f140e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_791.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
@@ -25,6 +27,7 @@
     {
       "identifier": "apache_2_0-e6c6a798-7f38-0f45-701a-6f3304caf1ee",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 78.46,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_jna1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_jna1.RULE",
@@ -223,6 +227,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -233,6 +238,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
@@ -255,6 +261,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 78.46,
@@ -265,6 +272,7 @@
               "match_coverage": 78.46,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_jna1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_jna1.RULE",
@@ -315,6 +323,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-clue_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-clue_1.RULE",
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 bf4bfcd465e..e1beb508bdf 100644
--- a/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_1_0-01e67edb-9930-c1d2-2a95-f923a0ecacfb",
       "license_expression": "apache-1.0",
+      "license_expression_spdx": "Apache-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "rule_identifier": "apache-1.0.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
@@ -24,6 +26,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -35,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-258b785d25f606282f8c2f4ed6e51a66b60b7f16",
           "rule_relevance": 100,
           "rule_url": null,
@@ -52,6 +56,7 @@
       "license_detections": [
         {
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -62,6 +67,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
               "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE"
@@ -82,6 +88,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -92,6 +99,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null
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 fce21e8508c..dabedc9f9ea 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
@@ -3,6 +3,7 @@
     {
       "identifier": "zlib_and_apache_2_0-98210dcd-8eb2-6675-dd67-08f007face08",
       "license_expression": "zlib AND apache-2.0",
+      "license_expression_spdx": "Zlib AND Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "spdx-license-identifier-zlib-478bffd97a87207ab3ba955132d7a51b329faca0",
           "rule_relevance": 100,
           "rule_url": null,
@@ -29,6 +31,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx-license-identifier-apache-2.0-5dcda840588b4f07f49f2c0100924ebca7bc0649",
           "rule_relevance": 100,
           "rule_url": null,
@@ -46,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "zlib AND apache-2.0",
+          "license_expression_spdx": "Zlib AND Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -56,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "spdx-license-identifier-zlib-defbb051fec96d25d21a92bf9e28889f674a89dc",
               "rule_relevance": 100,
               "rule_url": null,
@@ -70,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx-license-identifier-apache-2.0-8b7d7ba520c6ab392deaea36b8b1f018b637027e",
               "rule_relevance": 100,
               "rule_url": null,
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 c62e69f6b09..582c2a6313f 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
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_2_0-1c807a43-2040-70af-75aa-c343d5f2b90c",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_91.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_91.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -41,6 +44,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -53,6 +57,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -70,6 +75,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -80,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -102,6 +109,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -112,6 +120,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_91.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_91.RULE",
@@ -126,6 +135,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
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 160519ef5af..f890619ac0d 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
@@ -3,6 +3,7 @@
     {
       "identifier": "mit-20c01557-97bd-0022-052e-56c5ed8465ea",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_25.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_66.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_66.RULE",
@@ -41,6 +44,7 @@
     {
       "identifier": "mit-6fc93e6a-0319-6943-7be7-2e20513a43e0",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -53,6 +57,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_66.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_66.RULE",
@@ -70,6 +75,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -80,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_66.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_66.RULE",
@@ -102,6 +109,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -112,6 +120,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_25.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_25.RULE",
@@ -126,6 +135,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_66.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_66.RULE",
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 611565fdcf0..d11c25ecfc4 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
@@ -3,6 +3,7 @@
     {
       "identifier": "x11_xconsortium_veillard-61f804f6-d484-92ca-09b5-26be51ac974e",
       "license_expression": "x11-xconsortium-veillard",
+      "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_30.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "rule_identifier": "x11-xconsortium-veillard.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -41,6 +44,7 @@
     {
       "identifier": "x11_xconsortium_veillard-50c015bd-e4e1-c6fe-eb82-9551473dd8e1",
       "license_expression": "x11-xconsortium-veillard",
+      "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -55,6 +59,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_108.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_108.RULE",
@@ -69,6 +74,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "rule_identifier": "x11-xconsortium-veillard.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -79,6 +85,7 @@
     {
       "identifier": "x11_xconsortium_veillard-b2601908-f03c-335c-5bbd-e72dc065c901",
       "license_expression": "x11-xconsortium-veillard",
+      "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -91,6 +98,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "rule_identifier": "x11-xconsortium-veillard.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -108,6 +116,7 @@
       "license_detections": [
         {
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "matches": [
             {
               "score": 100.0,
@@ -118,6 +127,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium-veillard",
+              "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard",
               "rule_identifier": "x11-xconsortium-veillard.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -140,6 +150,7 @@
       "license_detections": [
         {
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "matches": [
             {
               "score": 100.0,
@@ -150,6 +161,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_30.RULE",
@@ -164,6 +176,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium-veillard",
+              "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard",
               "rule_identifier": "x11-xconsortium-veillard.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -188,6 +201,7 @@
       "license_detections": [
         {
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "matches": [
             {
               "score": 100.0,
@@ -198,6 +212,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_30.RULE",
@@ -212,6 +227,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium-veillard",
+              "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard",
               "rule_identifier": "x11-xconsortium-veillard.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
@@ -256,6 +272,7 @@
       "license_detections": [
         {
           "license_expression": "x11-xconsortium-veillard",
+          "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
           "matches": [
             {
               "score": 100.0,
@@ -266,6 +283,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_108.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_108.RULE",
@@ -280,6 +298,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium-veillard",
+              "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard",
               "rule_identifier": "x11-xconsortium-veillard.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE",
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 91cbc154568..f9caf364525 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
@@ -3,6 +3,7 @@
     {
       "identifier": "unknown_license_reference-8dac7670-e286-f6de-27a1-f2b5c87524ff",
       "license_expression": "unknown-license-reference",
+      "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_25.RULE",
@@ -32,6 +34,7 @@
       "license_detections": [
         {
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "matches": [
             {
               "score": 100.0,
@@ -42,6 +45,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_25.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_25.RULE",
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 b3717c25971..c607543cb5c 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
@@ -3,6 +3,7 @@
     {
       "identifier": "mit-e46a912c-b32a-30d5-dc27-c13824253230",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 4,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see-license_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see-license_1.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_26.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -45,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -55,6 +59,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -67,6 +72,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -77,6 +83,7 @@
     {
       "identifier": "mit-86fcf017-3572-9813-b7e8-0a10ec4a120f",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -89,6 +96,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_26.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -103,6 +111,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -113,6 +122,7 @@
     {
       "identifier": "mit-ad99a349-2a14-9fe5-c6a6-366fd3b9067b",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -127,6 +137,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_1187.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1187.RULE",
@@ -141,6 +152,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_26.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -155,6 +167,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -165,6 +178,7 @@
     {
       "identifier": "mit-bdcba66f-6e80-f7bd-7994-748183fe5693",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -177,6 +191,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_31.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_31.RULE",
@@ -187,6 +202,7 @@
     {
       "identifier": "mit-d0a34f23-8c35-8874-a99f-6ed1e3b31f40",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -199,6 +215,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_1114.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1114.RULE",
@@ -216,6 +233,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -226,6 +244,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -240,6 +259,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -262,6 +282,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -272,6 +293,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_31.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_31.RULE",
@@ -294,6 +316,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -304,6 +327,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see-license_1.RULE",
@@ -318,6 +342,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -332,6 +357,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -356,6 +382,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -366,6 +393,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see-license_1.RULE",
@@ -380,6 +408,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -394,6 +423,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -418,6 +448,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -428,6 +459,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see-license_1.RULE",
@@ -442,6 +474,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -456,6 +489,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -480,6 +514,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -490,6 +525,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_1114.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1114.RULE",
@@ -512,6 +548,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -522,6 +559,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -544,6 +582,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -554,6 +593,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_1187.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1187.RULE",
@@ -568,6 +608,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -582,6 +623,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -616,6 +658,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -626,6 +669,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see-license_1.RULE",
@@ -640,6 +684,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_26.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE",
@@ -654,6 +699,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
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 d6aae93d097..c9c0cccbf36 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
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_1_0-01e67edb-9930-c1d2-2a95-f923a0ecacfb",
       "license_expression": "apache-1.0",
+      "license_expression_spdx": "Apache-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "rule_identifier": "apache-1.0.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
@@ -41,6 +43,7 @@
       "license_detections": [
         {
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +54,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
               "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE"
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 0430b3d065a..b99cd3ad3fa 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
@@ -1,6 +1,7 @@
 [
   {
     "license_expression": "epl-2.0",
+    "license_expression_spdx": "EPL-2.0",
     "matches": [
       {
         "score": 100.0,
@@ -11,6 +12,7 @@
         "match_coverage": 100.0,
         "matcher": "2-aho",
         "license_expression": "unknown-license-reference",
+        "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
         "rule_identifier": "license-intro_29.RULE",
         "rule_relevance": 100,
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_29.RULE",
@@ -25,6 +27,7 @@
         "match_coverage": 100.0,
         "matcher": "2-aho",
         "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
         "rule_identifier": "epl-2.0_30.RULE",
         "rule_relevance": 100,
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_30.RULE",
@@ -39,6 +42,7 @@
         "match_coverage": 100.0,
         "matcher": "2-aho",
         "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
         "rule_identifier": "epl-2.0_2.RULE",
         "rule_relevance": 100,
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_2.RULE",
@@ -53,6 +57,7 @@
         "match_coverage": 100.0,
         "matcher": "1-spdx-id",
         "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
         "rule_identifier": "spdx-license-identifier-epl-2.0-c05120fcba71854ec1ea0d2897a5dcb1290a6dea",
         "rule_relevance": 100,
         "rule_url": null,
diff --git a/tests/licensedcode/data/plugin_license/package/package.expected.json b/tests/licensedcode/data/plugin_license/package/package.expected.json
index 8f3d77353e1..6abef0f8345 100644
--- a/tests/licensedcode/data/plugin_license/package/package.expected.json
+++ b/tests/licensedcode/data/plugin_license/package/package.expected.json
@@ -42,6 +42,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -52,6 +53,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -115,6 +117,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -126,6 +129,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -136,6 +140,7 @@
     {
       "identifier": "mit-bdbee2a2-57b2-e502-e367-d613d7f6dda8",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -147,6 +152,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_272.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
@@ -202,6 +208,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -212,6 +219,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -266,6 +274,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -276,6 +285,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_272.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE"
diff --git a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
index d2f46ba49f0..4d1f36a9f1b 100644
--- a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
+++ b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "gpl_2_0_and_patent_disclaimer-3bb2602f-86f5-b9da-9bf5-b52e6920c8d1",
       "license_expression": "gpl-2.0 AND patent-disclaimer",
+      "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0 AND patent-disclaimer",
+          "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
           "rule_identifier": "gpl-2.0_and_patent-disclaimer_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_patent-disclaimer_3.RULE",
@@ -39,6 +41,7 @@
           "match_coverage": 14.39,
           "matcher": "3-seq",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl-2.0-plus_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_65.RULE"
@@ -55,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 AND patent-disclaimer",
+          "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
           "matches": [
             {
               "score": 100.0,
@@ -65,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0 AND patent-disclaimer",
+              "spdx_license_expression": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
               "rule_identifier": "gpl-2.0_and_patent-disclaimer_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_patent-disclaimer_3.RULE"
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 3d6b1a424c3..4ea5939f699 100644
--- a/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json
+++ b/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "gpl_1_0_plus-0211bbc4-784e-97fe-2ac1-f150ccba866e",
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_70.RULE",
           "rule_relevance": 90,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_70.RULE",
@@ -25,6 +27,7 @@
     {
       "identifier": "gpl_2_0_and_apache_2_0_and_lgpl_3_0_plus-c2393e5a-e531-304f-58a9-a6431d46d214",
       "license_expression": "gpl-2.0 AND apache-2.0 AND lgpl-3.0-plus",
+      "license_expression_spdx": "GPL-2.0-only AND Apache-2.0 AND LGPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_870.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_870.RULE",
@@ -51,6 +55,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_411.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_411.RULE",
@@ -65,6 +70,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_130.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_130.RULE",
@@ -75,6 +81,7 @@
     {
       "identifier": "ijg_and_mit-e50613dc-8a09-65cc-c498-5d9527795382",
       "license_expression": "ijg AND mit",
+      "license_expression_spdx": "IJG AND MIT",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -89,6 +96,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_235.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_235.RULE",
@@ -103,6 +111,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "ijg",
+          "license_expression_spdx": "IJG",
           "rule_identifier": "ijg_28.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ijg_28.RULE",
@@ -117,6 +126,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_576.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_576.RULE",
@@ -127,6 +137,7 @@
     {
       "identifier": "lgpl_2_1_plus_and_other_permissive_and_gpl_2_0_plus-666058ef-8c38-3b17-d8e7-448b304de833",
       "license_expression": "lgpl-2.1-plus AND other-permissive AND gpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -139,6 +150,7 @@
           "match_coverage": 99.09,
           "matcher": "3-seq",
           "license_expression": "lgpl-2.1-plus AND other-permissive AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later",
           "rule_identifier": "lgpl-2.1-plus_and__other-permissive_and_gpl-2.0-plus_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and__other-permissive_and_gpl-2.0-plus_1.RULE",
@@ -149,6 +161,7 @@
     {
       "identifier": "lgpl_3_0_and_lgpl_3_0_plus_and__lgpl_3_0_and_gpl_3_0-eb2232a5-2c4f-3fc9-a2ee-cdf40b20ae23",
       "license_expression": "lgpl-3.0 AND lgpl-3.0-plus AND (lgpl-3.0 AND gpl-3.0)",
+      "license_expression_spdx": "LGPL-3.0-only AND LGPL-3.0-or-later AND (LGPL-3.0-only AND GPL-3.0-only)",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -161,6 +174,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_134.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_134.RULE",
@@ -175,6 +189,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_130.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_130.RULE",
@@ -189,6 +204,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0 AND gpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only AND GPL-3.0-only",
           "rule_identifier": "lgpl-3.0_and_gpl-3.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_and_gpl-3.0_2.RULE",
@@ -206,6 +222,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus AND other-permissive AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 99.09,
@@ -216,6 +233,7 @@
               "match_coverage": 99.09,
               "matcher": "3-seq",
               "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",
               "rule_identifier": "lgpl-2.1-plus_and__other-permissive_and_gpl-2.0-plus_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and__other-permissive_and_gpl-2.0-plus_1.RULE",
@@ -227,6 +245,7 @@
         },
         {
           "license_expression": "lgpl-3.0 AND lgpl-3.0-plus AND (lgpl-3.0 AND gpl-3.0)",
+          "license_expression_spdx": "LGPL-3.0-only AND LGPL-3.0-or-later AND (LGPL-3.0-only AND GPL-3.0-only)",
           "matches": [
             {
               "score": 100.0,
@@ -237,6 +256,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_134.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_134.RULE",
@@ -251,6 +271,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_130.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_130.RULE",
@@ -265,6 +286,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0 AND gpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only AND GPL-3.0-only",
               "rule_identifier": "lgpl-3.0_and_gpl-3.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_and_gpl-3.0_2.RULE",
@@ -276,6 +298,7 @@
         },
         {
           "license_expression": "ijg AND mit",
+          "license_expression_spdx": "IJG AND MIT",
           "matches": [
             {
               "score": 100.0,
@@ -286,6 +309,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_235.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_235.RULE",
@@ -300,6 +324,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "ijg",
+              "spdx_license_expression": "IJG",
               "rule_identifier": "ijg_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ijg_28.RULE",
@@ -314,6 +339,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_576.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_576.RULE",
@@ -327,6 +353,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 90.0,
@@ -337,6 +364,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_70.RULE",
               "rule_relevance": 90,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_70.RULE",
@@ -348,6 +376,7 @@
         },
         {
           "license_expression": "gpl-2.0 AND apache-2.0 AND lgpl-3.0-plus",
+          "license_expression_spdx": "GPL-2.0-only AND Apache-2.0 AND LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -358,6 +387,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_870.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_870.RULE",
@@ -372,6 +402,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_411.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_411.RULE",
@@ -386,6 +417,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_130.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_130.RULE",
@@ -406,6 +438,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_bare_single_word.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -420,6 +453,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_bare_single_word.RULE",
           "rule_relevance": 75,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -434,6 +468,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "proprietary-license",
+          "spdx_license_expression": "LicenseRef-scancode-proprietary-license",
           "rule_identifier": "proprietary-license_490.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_490.RULE",
@@ -448,6 +483,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_bare_single_word.RULE",
           "rule_relevance": 75,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
diff --git a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
index 1c82a36b158..dac01a5e43f 100644
--- a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
+++ b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "blessing-728ecfdc-abda-aff7-2b96-4e2cbd706f0d",
       "license_expression": "blessing",
+      "license_expression_spdx": "blessing",
       "detection_count": 136,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "rule_identifier": "blessing.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -41,6 +43,7 @@
       "license_detections": [
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +54,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -61,6 +65,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +76,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -81,6 +87,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -91,6 +98,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -101,6 +109,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -111,6 +120,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -121,6 +131,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -131,6 +142,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -141,6 +153,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -151,6 +164,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -161,6 +175,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -171,6 +186,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -181,6 +197,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -191,6 +208,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -201,6 +219,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -211,6 +230,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -221,6 +241,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -231,6 +252,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -241,6 +263,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -251,6 +274,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -261,6 +285,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -271,6 +296,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -281,6 +307,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -291,6 +318,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -301,6 +329,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -311,6 +340,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -321,6 +351,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -331,6 +362,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -341,6 +373,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -351,6 +384,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -361,6 +395,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -371,6 +406,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -381,6 +417,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -391,6 +428,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -401,6 +439,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -411,6 +450,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -421,6 +461,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -431,6 +472,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -441,6 +483,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -451,6 +494,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -461,6 +505,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -471,6 +516,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -481,6 +527,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -491,6 +538,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -501,6 +549,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -511,6 +560,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -521,6 +571,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -531,6 +582,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -541,6 +593,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -551,6 +604,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -561,6 +615,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -571,6 +626,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -581,6 +637,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -591,6 +648,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -601,6 +659,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -611,6 +670,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -621,6 +681,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -631,6 +692,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -641,6 +703,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -651,6 +714,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -661,6 +725,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -671,6 +736,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -681,6 +747,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -691,6 +758,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -701,6 +769,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -711,6 +780,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -721,6 +791,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -731,6 +802,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -741,6 +813,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -751,6 +824,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -761,6 +835,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -771,6 +846,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -781,6 +857,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -791,6 +868,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -801,6 +879,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -811,6 +890,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -821,6 +901,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -831,6 +912,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -841,6 +923,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -851,6 +934,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -861,6 +945,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -871,6 +956,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -881,6 +967,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -891,6 +978,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -901,6 +989,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -911,6 +1000,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -921,6 +1011,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -931,6 +1022,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -941,6 +1033,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -951,6 +1044,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -961,6 +1055,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -971,6 +1066,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -981,6 +1077,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -991,6 +1088,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1001,6 +1099,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1011,6 +1110,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1021,6 +1121,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1031,6 +1132,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1041,6 +1143,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1051,6 +1154,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1061,6 +1165,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1071,6 +1176,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1081,6 +1187,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1091,6 +1198,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1101,6 +1209,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1111,6 +1220,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1121,6 +1231,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1131,6 +1242,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1141,6 +1253,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1151,6 +1264,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1161,6 +1275,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1171,6 +1286,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1181,6 +1297,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1191,6 +1308,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1201,6 +1319,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1211,6 +1330,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1221,6 +1341,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1231,6 +1352,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1241,6 +1363,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1251,6 +1374,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1261,6 +1385,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1271,6 +1396,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1281,6 +1407,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1291,6 +1418,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1301,6 +1429,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1311,6 +1440,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1321,6 +1451,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1331,6 +1462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1341,6 +1473,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1351,6 +1484,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1361,6 +1495,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1371,6 +1506,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1381,6 +1517,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1391,6 +1528,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1401,6 +1539,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1411,6 +1550,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1421,6 +1561,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1431,6 +1572,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1441,6 +1583,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1451,6 +1594,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1461,6 +1605,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1471,6 +1616,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1481,6 +1627,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1491,6 +1638,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1501,6 +1649,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1511,6 +1660,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1521,6 +1671,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1531,6 +1682,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1541,6 +1693,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1551,6 +1704,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1561,6 +1715,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1571,6 +1726,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1581,6 +1737,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1591,6 +1748,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1601,6 +1759,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1611,6 +1770,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1621,6 +1781,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1631,6 +1792,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1641,6 +1803,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1651,6 +1814,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1661,6 +1825,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1671,6 +1836,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1681,6 +1847,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1691,6 +1858,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1701,6 +1869,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1711,6 +1880,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1721,6 +1891,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1731,6 +1902,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1741,6 +1913,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1751,6 +1924,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1761,6 +1935,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1771,6 +1946,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1781,6 +1957,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1791,6 +1968,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1801,6 +1979,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1811,6 +1990,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1821,6 +2001,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1831,6 +2012,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1841,6 +2023,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1851,6 +2034,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1861,6 +2045,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1871,6 +2056,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1881,6 +2067,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1891,6 +2078,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1901,6 +2089,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1911,6 +2100,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1921,6 +2111,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1931,6 +2122,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1941,6 +2133,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1951,6 +2144,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1961,6 +2155,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1971,6 +2166,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -1981,6 +2177,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -1991,6 +2188,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2001,6 +2199,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2011,6 +2210,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2021,6 +2221,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2031,6 +2232,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2041,6 +2243,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2051,6 +2254,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2061,6 +2265,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2071,6 +2276,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2081,6 +2287,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2091,6 +2298,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2101,6 +2309,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2111,6 +2320,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2121,6 +2331,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2131,6 +2342,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2141,6 +2353,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2151,6 +2364,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2161,6 +2375,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2171,6 +2386,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2181,6 +2397,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2191,6 +2408,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2201,6 +2419,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2211,6 +2430,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2221,6 +2441,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2231,6 +2452,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2241,6 +2463,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2251,6 +2474,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2261,6 +2485,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2271,6 +2496,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2281,6 +2507,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2291,6 +2518,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2301,6 +2529,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2311,6 +2540,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2321,6 +2551,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2331,6 +2562,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2341,6 +2573,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2351,6 +2584,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2361,6 +2595,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2371,6 +2606,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2381,6 +2617,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2391,6 +2628,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2401,6 +2639,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2411,6 +2650,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2421,6 +2661,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2431,6 +2672,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2441,6 +2683,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2451,6 +2694,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2461,6 +2705,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2471,6 +2716,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2481,6 +2727,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2491,6 +2738,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2501,6 +2749,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2511,6 +2760,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2521,6 +2771,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2531,6 +2782,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2541,6 +2793,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2551,6 +2804,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2561,6 +2815,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2571,6 +2826,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2581,6 +2837,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2591,6 +2848,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2601,6 +2859,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2611,6 +2870,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2621,6 +2881,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2631,6 +2892,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2641,6 +2903,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2651,6 +2914,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2661,6 +2925,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2671,6 +2936,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2681,6 +2947,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2691,6 +2958,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2701,6 +2969,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2711,6 +2980,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2721,6 +2991,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2731,6 +3002,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
@@ -2741,6 +3013,7 @@
         },
         {
           "license_expression": "blessing",
+          "license_expression_spdx": "blessing",
           "matches": [
             {
               "score": 100.0,
@@ -2751,6 +3024,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "blessing",
+              "spdx_license_expression": "blessing",
               "rule_identifier": "blessing.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/blessing.LICENSE",
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 6e017801bf7..96668090386 100644
--- a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "fsf_ap-49ad9aab-c91b-eeb7-e90f-dc3f959b1c36",
       "license_expression": "fsf-ap",
+      "license_expression_spdx": "FSFAP",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 91.43,
           "matcher": "3-seq",
           "license_expression": "fsf-ap",
+          "license_expression_spdx": "FSFAP",
           "rule_identifier": "fsf-ap.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE",
@@ -25,6 +27,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
           "rule_url": null,
@@ -54,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -64,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +92,7 @@
       "license_detections": [
         {
           "license_expression": "fsf-ap",
+          "license_expression_spdx": "FSFAP",
           "matches": [
             {
               "score": 91.43,
@@ -96,6 +103,7 @@
               "match_coverage": 91.43,
               "matcher": "3-seq",
               "license_expression": "fsf-ap",
+              "spdx_license_expression": "FSFAP",
               "rule_identifier": "fsf-ap.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE",
diff --git a/tests/licensedcode/data/plugin_license/text/scan.expected.json b/tests/licensedcode/data/plugin_license/text/scan.expected.json
index 6e017801bf7..96668090386 100644
--- a/tests/licensedcode/data/plugin_license/text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "fsf_ap-49ad9aab-c91b-eeb7-e90f-dc3f959b1c36",
       "license_expression": "fsf-ap",
+      "license_expression_spdx": "FSFAP",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 91.43,
           "matcher": "3-seq",
           "license_expression": "fsf-ap",
+          "license_expression_spdx": "FSFAP",
           "rule_identifier": "fsf-ap.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE",
@@ -25,6 +27,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
           "rule_url": null,
@@ -54,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -64,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +92,7 @@
       "license_detections": [
         {
           "license_expression": "fsf-ap",
+          "license_expression_spdx": "FSFAP",
           "matches": [
             {
               "score": 91.43,
@@ -96,6 +103,7 @@
               "match_coverage": 91.43,
               "matcher": "3-seq",
               "license_expression": "fsf-ap",
+              "spdx_license_expression": "FSFAP",
               "rule_identifier": "fsf-ap.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE",
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 b29c04006f4..005c4085c78 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
@@ -3,6 +3,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
           "rule_url": null,
@@ -25,6 +27,7 @@
     {
       "identifier": "unlicense-5cac2dde-ce1c-ad2c-181b-a2b96eff3bab",
       "license_expression": "unlicense",
+      "license_expression_spdx": "Unlicense",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unlicense",
+          "license_expression_spdx": "Unlicense",
           "rule_identifier": "unlicense.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
@@ -54,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -64,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +92,7 @@
       "license_detections": [
         {
           "license_expression": "unlicense",
+          "license_expression_spdx": "Unlicense",
           "matches": [
             {
               "score": 100.0,
@@ -96,6 +103,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unlicense",
+              "spdx_license_expression": "Unlicense",
               "rule_identifier": "unlicense.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
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 b29c04006f4..005c4085c78 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
@@ -3,6 +3,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
           "rule_url": null,
@@ -25,6 +27,7 @@
     {
       "identifier": "unlicense-5cac2dde-ce1c-ad2c-181b-a2b96eff3bab",
       "license_expression": "unlicense",
+      "license_expression_spdx": "Unlicense",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unlicense",
+          "license_expression_spdx": "Unlicense",
           "rule_identifier": "unlicense.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
@@ -54,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -64,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null,
@@ -86,6 +92,7 @@
       "license_detections": [
         {
           "license_expression": "unlicense",
+          "license_expression_spdx": "Unlicense",
           "matches": [
             {
               "score": 100.0,
@@ -96,6 +103,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unlicense",
+              "spdx_license_expression": "Unlicense",
               "rule_identifier": "unlicense.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
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 314a513d83b..6ddc235aeb4 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
@@ -3,6 +3,7 @@
     {
       "identifier": "wtfpl_2_0_and_mit-e5642b07-705c-9730-80ab-f5ed0565be28",
       "license_expression": "wtfpl-2.0 AND mit",
+      "license_expression_spdx": "WTFPL AND MIT",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "lead-in_unknown_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "wtfpl-2.0",
+          "license_expression_spdx": "WTFPL",
           "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
@@ -45,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "wtfpl-2.0",
+          "license_expression_spdx": "WTFPL",
           "rule_identifier": "wtfpl-2.0_27.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
@@ -59,6 +63,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_64.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
@@ -76,6 +81,7 @@
       "license_detections": [
         {
           "license_expression": "wtfpl-2.0 AND mit",
+          "license_expression_spdx": "WTFPL AND MIT",
           "matches": [
             {
               "score": 100.0,
@@ -86,6 +92,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "lead-in_unknown_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
@@ -100,6 +107,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "wtfpl-2.0",
+              "spdx_license_expression": "WTFPL",
               "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
@@ -114,6 +122,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "wtfpl-2.0",
+              "spdx_license_expression": "WTFPL",
               "rule_identifier": "wtfpl-2.0_27.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
@@ -128,6 +137,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_64.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
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 8aca7b9556f..c33b25edbd1 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
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_2_0-ec71f0b5-0d51-269d-4401-8cfe56a05bfe",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1208.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE",
@@ -25,6 +27,7 @@
     {
       "identifier": "apache_2_0-14c27abb-363c-4c38-b5c4-095fce7dd164",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1203.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
@@ -47,6 +51,7 @@
     {
       "identifier": "apache_2_0-c6b06d3c-dbcf-4722-6e26-e6d782bf756a",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -59,6 +64,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1205.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1205.RULE",
@@ -69,6 +75,7 @@
     {
       "identifier": "bsd_new-014c3756-34c9-b9ea-9dd3-44adda06cbdf",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -81,6 +88,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_1270.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1270.RULE",
@@ -95,6 +103,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_1271.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1271.RULE",
@@ -105,6 +114,7 @@
     {
       "identifier": "bsd_new-90d0d4b4-f98b-d4da-dbb0-7e601f6d404a",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -117,6 +127,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_860.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_860.RULE",
@@ -127,6 +138,7 @@
     {
       "identifier": "cpl_1_0-08dc5398-457d-49be-a798-b57fe4d8de3e",
       "license_expression": "cpl-1.0",
+      "license_expression_spdx": "CPL-1.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -139,6 +151,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "license_expression_spdx": "CPL-1.0",
           "rule_identifier": "cpl-1.0_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_36.RULE",
@@ -149,6 +162,7 @@
     {
       "identifier": "cpl_1_0-3d9a9925-4663-aa7d-fe9c-d421afd87296",
       "license_expression": "cpl-1.0",
+      "license_expression_spdx": "CPL-1.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -161,6 +175,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "license_expression_spdx": "CPL-1.0",
           "rule_identifier": "cpl-1.0_31.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_31.RULE",
@@ -171,6 +186,7 @@
     {
       "identifier": "epl_1_0-24481246-c972-682f-28a6-1e4bb59b73c5",
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -183,6 +199,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "rule_identifier": "epl-1.0_104.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_104.RULE",
@@ -193,6 +210,7 @@
     {
       "identifier": "epl_1_0-4850ab41-51b3-282e-61da-d1dd32d1eef2",
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -205,6 +223,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "rule_identifier": "epl-1.0_99.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_99.RULE",
@@ -215,6 +234,7 @@
     {
       "identifier": "epl_2_0-2d958c5c-8c7d-0aab-f347-248562781281",
       "license_expression": "epl-2.0",
+      "license_expression_spdx": "EPL-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -227,6 +247,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-2.0",
+          "license_expression_spdx": "EPL-2.0",
           "rule_identifier": "epl-2.0_67.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_67.RULE",
@@ -244,6 +265,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -254,6 +276,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_99.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_99.RULE",
@@ -265,6 +288,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -275,6 +299,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1203.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
@@ -286,6 +311,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -296,6 +322,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1205.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1205.RULE",
@@ -318,6 +345,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -328,6 +356,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_99.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_99.RULE",
@@ -339,6 +368,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -349,6 +379,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1203.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
@@ -360,6 +391,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -370,6 +402,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1205.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1205.RULE",
@@ -381,6 +414,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -391,6 +425,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE",
@@ -402,6 +437,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -412,6 +448,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE",
@@ -423,6 +460,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -433,6 +471,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE",
@@ -444,6 +483,7 @@
         },
         {
           "license_expression": "epl-2.0",
+          "license_expression_spdx": "EPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -454,6 +494,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-2.0",
+              "spdx_license_expression": "EPL-2.0",
               "rule_identifier": "epl-2.0_67.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_67.RULE",
@@ -476,6 +517,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -486,6 +528,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_104.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_104.RULE",
@@ -497,6 +540,7 @@
         },
         {
           "license_expression": "cpl-1.0",
+          "license_expression_spdx": "CPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -507,6 +551,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cpl-1.0",
+              "spdx_license_expression": "CPL-1.0",
               "rule_identifier": "cpl-1.0_31.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_31.RULE",
@@ -518,6 +563,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -528,6 +574,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1270.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1270.RULE",
@@ -542,6 +589,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1271.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1271.RULE",
@@ -553,6 +601,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -563,6 +612,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_860.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_860.RULE",
@@ -585,6 +635,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -595,6 +646,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_104.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_104.RULE",
@@ -606,6 +658,7 @@
         },
         {
           "license_expression": "cpl-1.0",
+          "license_expression_spdx": "CPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -616,6 +669,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cpl-1.0",
+              "spdx_license_expression": "CPL-1.0",
               "rule_identifier": "cpl-1.0_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_36.RULE",
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 2af66e2b5cc..ee69795d83e 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
@@ -3,6 +3,7 @@
     {
       "identifier": "epl_2_0-c1e39224-7271-293c-64f7-090bd2f15988",
       "license_expression": "epl-2.0",
+      "license_expression_spdx": "EPL-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-2.0",
+          "license_expression_spdx": "EPL-2.0",
           "rule_identifier": "epl-2.0_56.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_56.RULE",
@@ -29,6 +31,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "epl-2.0",
+          "license_expression_spdx": "EPL-2.0",
           "rule_identifier": "spdx-license-identifier-epl-2.0-fc3580adf1834d6862422242a06d59e74eb62582",
           "rule_relevance": 100,
           "rule_url": null,
@@ -46,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "epl-2.0",
+          "license_expression_spdx": "EPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -56,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-2.0",
+              "spdx_license_expression": "EPL-2.0",
               "rule_identifier": "epl-2.0_56.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_56.RULE",
@@ -70,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "epl-2.0",
+              "spdx_license_expression": "EPL-2.0",
               "rule_identifier": "spdx-license-identifier-epl-2.0-c05120fcba71854ec1ea0d2897a5dcb1290a6dea",
               "rule_relevance": 100,
               "rule_url": null,
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 b428ad23843..772bca7a20e 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
@@ -3,6 +3,7 @@
     {
       "identifier": "bzip2_libbzip_2010-2234b9aa-1198-8ed2-f0d2-3310ced04b8a",
       "license_expression": "bzip2-libbzip-2010",
+      "license_expression_spdx": "bzip2-1.0.6",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_4.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bzip2-libbzip-2010",
+          "license_expression_spdx": "bzip2-1.0.6",
           "rule_identifier": "bzip2-libbzip-2010.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
@@ -41,6 +44,7 @@
     {
       "identifier": "x11_lucent-3c40145a-efd5-16ba-0a7a-9c28d9993bc2",
       "license_expression": "x11-lucent",
+      "license_expression_spdx": "dtoa",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -55,6 +59,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_4.RULE",
@@ -69,6 +74,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "x11-lucent",
+          "license_expression_spdx": "dtoa",
           "rule_identifier": "x11-lucent_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent_1.RULE",
@@ -86,6 +92,7 @@
       "license_detections": [
         {
           "license_expression": "x11-lucent",
+          "license_expression_spdx": "dtoa",
           "matches": [
             {
               "score": 100.0,
@@ -96,6 +103,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_4.RULE",
@@ -110,6 +118,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-lucent",
+              "spdx_license_expression": "dtoa",
               "rule_identifier": "x11-lucent_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent_1.RULE",
@@ -123,6 +132,7 @@
         },
         {
           "license_expression": "bzip2-libbzip-2010",
+          "license_expression_spdx": "bzip2-1.0.6",
           "matches": [
             {
               "score": 100.0,
@@ -133,6 +143,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_4.RULE",
@@ -147,6 +158,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bzip2-libbzip-2010",
+              "spdx_license_expression": "bzip2-1.0.6",
               "rule_identifier": "bzip2-libbzip-2010.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
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 3feb67e38fa..86c9da16e43 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
@@ -3,6 +3,7 @@
     {
       "identifier": "mit-3c947379-4257-acb2-bf21-5f93f7de0076",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [
         "unknown-intro-followed-by-match"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_2.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
@@ -31,6 +33,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_21.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_21.RULE",
@@ -45,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_31.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_31.RULE",
@@ -59,6 +63,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -76,6 +81,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 50.0,
@@ -86,6 +92,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
@@ -100,6 +107,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_21.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_21.RULE",
@@ -114,6 +122,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_31.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_31.RULE",
@@ -128,6 +137,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
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 1d30255c832..c25c7fa178b 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
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_2_0_and_gpl_3_0-a4aa7fb0-a160-c0e2-faf5-fabdc3f257c2",
       "license_expression": "apache-2.0 AND gpl-3.0",
+      "license_expression_spdx": "Apache-2.0 AND GPL-3.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1214.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1214.RULE",
@@ -28,6 +30,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_173.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_173.RULE",
@@ -61,6 +64,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND gpl-3.0",
+          "license_expression_spdx": "Apache-2.0 AND GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1214.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1214.RULE"
@@ -84,6 +89,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_173.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_173.RULE"
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 fe81b0ce1d8..807f7c17af7 100644
--- a/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json
+++ b/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "broadcom_commercial-c75957a5-a538-0f21-d34e-5cb732b83de0",
       "license_expression": "broadcom-commercial",
+      "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "broadcom-commercial",
+          "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial",
           "rule_identifier": "broadcom-commercial.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/broadcom-commercial.LICENSE",
@@ -24,6 +26,7 @@
     {
       "identifier": "bsd_1988-6f82c6f9-3188-d25a-b614-a8da40a182eb",
       "license_expression": "bsd-1988",
+      "license_expression_spdx": "LicenseRef-scancode-bsd-1988",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -35,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-1988",
+          "license_expression_spdx": "LicenseRef-scancode-bsd-1988",
           "rule_identifier": "bsd-1988.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-1988.LICENSE",
@@ -45,6 +49,7 @@
     {
       "identifier": "esri_devkit-61ff055a-1f77-2a34-84c0-13880adcee3a",
       "license_expression": "esri-devkit",
+      "license_expression_spdx": "LicenseRef-scancode-esri-devkit",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -56,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "esri-devkit",
+          "license_expression_spdx": "LicenseRef-scancode-esri-devkit",
           "rule_identifier": "esri-devkit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/esri-devkit.LICENSE",
@@ -66,6 +72,7 @@
     {
       "identifier": "oracle_java_ee_sdk_2010-62721c1c-0579-102d-4299-b9ada4a65100",
       "license_expression": "oracle-java-ee-sdk-2010",
+      "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -77,6 +84,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "oracle-java-ee-sdk-2010",
+          "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
           "rule_identifier": "oracle-java-ee-sdk-2010.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/oracle-java-ee-sdk-2010.LICENSE",
@@ -87,6 +95,7 @@
     {
       "identifier": "rh_eula-5e8f3250-f910-dacc-e3f1-b0ee8c925477",
       "license_expression": "rh-eula",
+      "license_expression_spdx": "LicenseRef-scancode-rh-eula",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -98,6 +107,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "rh-eula",
+          "license_expression_spdx": "LicenseRef-scancode-rh-eula",
           "rule_identifier": "rh-eula.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rh-eula.LICENSE",
@@ -191,6 +201,7 @@
       "license_detections": [
         {
           "license_expression": "broadcom-commercial",
+          "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial",
           "matches": [
             {
               "score": 100.0,
@@ -201,6 +212,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "broadcom-commercial",
+              "spdx_license_expression": "LicenseRef-scancode-broadcom-commercial",
               "rule_identifier": "broadcom-commercial.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/broadcom-commercial.LICENSE"
@@ -248,6 +260,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-1988",
+          "license_expression_spdx": "LicenseRef-scancode-bsd-1988",
           "matches": [
             {
               "score": 100.0,
@@ -258,6 +271,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-1988",
+              "spdx_license_expression": "LicenseRef-scancode-bsd-1988",
               "rule_identifier": "bsd-1988.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-1988.LICENSE"
@@ -305,6 +319,7 @@
       "license_detections": [
         {
           "license_expression": "esri-devkit",
+          "license_expression_spdx": "LicenseRef-scancode-esri-devkit",
           "matches": [
             {
               "score": 100.0,
@@ -315,6 +330,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "esri-devkit",
+              "spdx_license_expression": "LicenseRef-scancode-esri-devkit",
               "rule_identifier": "esri-devkit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/esri-devkit.LICENSE"
@@ -362,6 +378,7 @@
       "license_detections": [
         {
           "license_expression": "oracle-java-ee-sdk-2010",
+          "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
           "matches": [
             {
               "score": 100.0,
@@ -372,6 +389,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "oracle-java-ee-sdk-2010",
+              "spdx_license_expression": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
               "rule_identifier": "oracle-java-ee-sdk-2010.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/oracle-java-ee-sdk-2010.LICENSE"
@@ -419,6 +437,7 @@
       "license_detections": [
         {
           "license_expression": "rh-eula",
+          "license_expression_spdx": "LicenseRef-scancode-rh-eula",
           "matches": [
             {
               "score": 100.0,
@@ -429,6 +448,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "rh-eula",
+              "spdx_license_expression": "LicenseRef-scancode-rh-eula",
               "rule_identifier": "rh-eula.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rh-eula.LICENSE"
diff --git a/tests/licensedcode/data/plugin_license_text/scan.expected.json b/tests/licensedcode/data/plugin_license_text/scan.expected.json
index 642881270b3..792cffc2feb 100644
--- a/tests/licensedcode/data/plugin_license_text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license_text/scan.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "apache_1_0-01e67edb-9930-c1d2-2a95-f923a0ecacfb",
       "license_expression": "apache-1.0",
+      "license_expression_spdx": "Apache-1.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "rule_identifier": "apache-1.0.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
@@ -25,6 +27,7 @@
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -47,6 +51,7 @@
     {
       "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -59,6 +64,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
           "rule_url": null,
@@ -69,6 +75,7 @@
     {
       "identifier": "ja_sig-025b96bc-0a83-9578-3e3f-0e0375a87457",
       "license_expression": "ja-sig",
+      "license_expression_spdx": "LicenseRef-scancode-ja-sig",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -81,6 +88,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "ja-sig",
+          "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "rule_identifier": "ja-sig.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
@@ -143,6 +151,7 @@
       "license_detections": [
         {
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -153,6 +162,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
               "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
@@ -194,6 +204,7 @@
       "license_detections": [
         {
           "license_expression": "apache-1.0",
+          "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -204,6 +215,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
               "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
@@ -245,6 +257,7 @@
       "license_detections": [
         {
           "license_expression": "ja-sig",
+          "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "matches": [
             {
               "score": 100.0,
@@ -255,6 +268,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "ja-sig",
+              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
               "rule_identifier": "ja-sig.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
@@ -266,6 +280,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -276,6 +291,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -317,6 +333,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
               "score": 100.0,
@@ -327,6 +344,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
               "rule_url": null,
@@ -368,6 +386,7 @@
       "license_detections": [
         {
           "license_expression": "ja-sig",
+          "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "matches": [
             {
               "score": 100.0,
@@ -378,6 +397,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "ja-sig",
+              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
               "rule_identifier": "ja-sig.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
@@ -389,6 +409,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -399,6 +420,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json
index 596527497af..0ddfa45d308 100644
--- a/tests/packagedcode/data/about/aboutfiles.expected.json
+++ b/tests/packagedcode/data/about/aboutfiles.expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -222,6 +226,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -232,6 +237,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -313,6 +319,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -323,6 +330,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/about/apipkg.ABOUT-expected b/tests/packagedcode/data/about/apipkg.ABOUT-expected
index 7ccf8414aca..7647b2d6c86 100644
--- a/tests/packagedcode/data/about/apipkg.ABOUT-expected
+++ b/tests/packagedcode/data/about/apipkg.ABOUT-expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/about/appdirs.ABOUT-expected b/tests/packagedcode/data/about/appdirs.ABOUT-expected
index 6dde7f5a2a6..ef560e35133 100644
--- a/tests/packagedcode/data/about/appdirs.ABOUT-expected
+++ b/tests/packagedcode/data/about/appdirs.ABOUT-expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
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 81813870e32..3a18139a94e 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
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -248,6 +250,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -258,6 +261,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -350,6 +354,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -360,6 +365,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -497,6 +503,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -507,6 +514,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -707,6 +715,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -717,6 +726,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1160,6 +1170,7 @@
     "license_detections": [
       {
         "license_expression": "mpl-2.0 AND mit",
+        "license_expression_spdx": "MPL-2.0 AND MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1170,6 +1181,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mpl-2.0 AND mit",
+            "spdx_license_expression": "MPL-2.0 AND MIT",
             "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1262,6 +1274,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -1272,6 +1285,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1454,6 +1468,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -1464,6 +1479,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1556,6 +1572,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1566,6 +1583,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1646,6 +1664,7 @@
     "license_detections": [
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 100.0,
@@ -1656,6 +1675,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1748,6 +1768,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1758,6 +1779,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1847,6 +1869,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1857,6 +1880,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1937,6 +1961,7 @@
     "license_detections": [
       {
         "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+        "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -1947,6 +1972,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "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",
             "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
             "rule_url": null,
@@ -2063,6 +2089,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-simplified AND bsd-new",
+        "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -2073,6 +2100,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "bsd-simplified AND bsd-new",
+            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
             "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_relevance": 100,
             "rule_url": null,
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 078b55374e9..b54937ae56e 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
@@ -39,6 +39,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -49,6 +50,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -130,6 +132,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -140,6 +143,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -221,6 +225,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -231,6 +236,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -312,6 +318,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -322,6 +329,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -421,6 +429,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -431,6 +440,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -674,6 +684,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0 AND mit",
+          "license_expression_spdx": "MPL-2.0 AND MIT",
           "matches": [
             {
               "score": 100.0,
@@ -684,6 +695,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mpl-2.0 AND mit",
+              "spdx_license_expression": "MPL-2.0 AND MIT",
               "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_relevance": 100,
               "rule_url": null,
@@ -765,6 +777,7 @@
       "license_detections": [
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -775,6 +788,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
               "rule_url": null,
@@ -865,6 +879,7 @@
       "license_detections": [
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -875,6 +890,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
               "rule_url": null,
@@ -956,6 +972,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -966,6 +983,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1035,6 +1053,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1045,6 +1064,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1126,6 +1146,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1136,6 +1157,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1205,6 +1227,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1215,6 +1238,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1284,6 +1308,7 @@
       "license_detections": [
         {
           "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+          "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -1294,6 +1319,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1363,6 +1389,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-simplified AND bsd-new",
+          "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1373,6 +1400,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "bsd-simplified AND bsd-new",
+              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
               "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_relevance": 100,
               "rule_url": null,
@@ -2186,6 +2214,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -2196,6 +2225,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -2388,6 +2418,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -2398,6 +2429,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -2482,6 +2514,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -2492,6 +2525,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -2621,6 +2655,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -2631,6 +2666,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -2834,6 +2870,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -2844,6 +2881,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3279,6 +3317,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0 AND mit",
+              "license_expression_spdx": "MPL-2.0 AND MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -3289,6 +3328,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mpl-2.0 AND mit",
+                  "spdx_license_expression": "MPL-2.0 AND MIT",
                   "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3373,6 +3413,7 @@
           "license_detections": [
             {
               "license_expression": "openssl-ssleay",
+              "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
                   "score": 100.0,
@@ -3383,6 +3424,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
                   "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3557,6 +3599,7 @@
           "license_detections": [
             {
               "license_expression": "openssl-ssleay",
+              "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
                   "score": 100.0,
@@ -3567,6 +3610,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
                   "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3651,6 +3695,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3661,6 +3706,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -3736,6 +3782,7 @@
           "license_detections": [
             {
               "license_expression": "zlib",
+              "license_expression_spdx": "Zlib",
               "matches": [
                 {
                   "score": 100.0,
@@ -3746,6 +3793,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3830,6 +3878,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3840,6 +3889,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -3945,6 +3995,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3955,6 +4006,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -4030,6 +4082,7 @@
           "license_detections": [
             {
               "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+              "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -4040,6 +4093,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "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",
                   "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -4162,6 +4216,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-simplified AND bsd-new",
+              "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -4172,6 +4227,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "bsd-simplified AND bsd-new",
+                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
                   "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_relevance": 100,
                   "rule_url": null,
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 d30df032a2a..7575409f00d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_relevance": 100,
           "rule_url": null,
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 ad763409744..df77305970e 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 a286c304fa7..e9ea90dc986 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1",
+      "license_expression_spdx": "LGPL-2.1-only",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1",
+          "spdx_license_expression": "LGPL-2.1-only",
           "rule_identifier": "spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE",
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 c70d69698a0..2a8b5c49cf3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 79483c515ec..d61e833d4f9 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 1c78538f2ae..e684808daef 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND gfdl-1.2",
+      "license_expression_spdx": "LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-lgpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND gfdl-1.2-71479f146df396347c1f389292ea4ade2de988be",
           "rule_relevance": 100,
           "rule_url": null,
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 61389986540..aa0685676b7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 f53d46a2434..c160712d3ef 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 f53d46a2434..c160712d3ef 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 055a36b5723..351e9451ae2 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0 OR gpl-3.0",
+      "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 OR gpl-3.0",
+          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 OR gpl-3.0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_relevance": 100,
           "rule_url": null,
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 cb5b90a1f42..6b3eb82a16d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "(gpl-2.0 OR gpl-3.0) AND gpl-2.0-plus AND gpl-2.0 AND lgpl-2.1",
+      "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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND gpl-2.0-plus AND gpl-2.0 AND lgpl-2.1-807060997a907edbf6fb1afce31562a9d6562969",
           "rule_relevance": 100,
           "rule_url": null,
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 52aa5aea87f..482d8a1ca0a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "(gpl-2.0 AND lgpl-2.1) OR lgpl-3.0",
+      "license_expression_spdx": "(GPL-2.0-only AND LGPL-2.1-only) OR LGPL-3.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-(gpl-2.0 AND lgpl-2.1) OR lgpl-3.0-877e4ca7bc57bbc791f042ee281cee48814e200c",
           "rule_relevance": 100,
           "rule_url": null,
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 c46ed98576e..b77b32bab0d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 OR lgpl-3.0",
+      "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "lgpl-2.1 OR lgpl-3.0",
+          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR lgpl-3.0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_relevance": 100,
           "rule_url": null,
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 15cc5031180..91d9dfd000f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0 AND gpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.0-only AND GPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "lgpl-2.0 AND gpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-only AND GPL-2.0-or-later",
           "rule_identifier": "spdx-license-identifier-lgpl-2.0 AND gpl-2.0-plus-c8002ee7804f7830bc06d8d26df9e3e5d861c339",
           "rule_relevance": 100,
           "rule_url": null,
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 89ce01421b9..1c4bb9ab5d0 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 53945afdc20..f15091c80c6 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0 AND lgpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-only AND LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 AND lgpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.0-or-later",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 AND lgpl-2.0-plus-ec90969a128367759b81f6978fe09ff5a121b9c9",
           "rule_relevance": 100,
           "rule_url": null,
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 dc07597f462..9aed2b04db4 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)",
+      "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)-9138e20c7248ef0ad3b2f747b9f3cf4e17f3db2c",
           "rule_relevance": 100,
           "rule_url": null,
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 9423c9fb6e9..7e2454270bf 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 89b0abf9b9f..73f18c88684 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
           "rule_url": null,
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 10c39d3aebf..da5b2e89eeb 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)",
+      "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_relevance": 100,
           "rule_url": null,
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 83e2143c68e..bb9843750c4 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 c9ea0849666..a8a6b8eda24 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
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 8f7777962f1..6bd5803e6ed 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 OR lgpl-3.0",
+      "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "lgpl-2.1 OR lgpl-3.0",
+          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR lgpl-3.0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_relevance": 100,
           "rule_url": null,
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 b2b85375524..4e4a00f8068 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1",
+      "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_relevance": 100,
           "rule_url": null,
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 eeb7cfae4c8..bf9eca6fe80 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1",
+      "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_relevance": 100,
           "rule_url": null,
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 c543f48e30f..66546879e0f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 254b4c8f90e..70174798e4e 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)",
+      "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_relevance": 100,
           "rule_url": null,
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 2a29a6e2a7a..da53960c2fc 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus AND gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)",
+      "license_expression_spdx": "LGPL-2.1-or-later AND GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1-plus AND gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-42c579dc301f74170657fd26e8c1f4a629633b3e",
           "rule_relevance": 100,
           "rule_url": null,
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 9677d33fcf6..f84296e9012 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus AND (gpl-2.0 OR gpl-3.0)",
+      "license_expression_spdx": "LGPL-2.1-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1-plus AND (gpl-2.0 OR gpl-3.0)-5576b785bcf8108f0c7a5eb9a15c91087b4a9aad",
           "rule_relevance": 100,
           "rule_url": null,
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 d1a7091aaad..11de8288d91 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mpl-2.0",
+      "license_expression_spdx": "MPL-2.0",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mpl-2.0",
+          "spdx_license_expression": "MPL-2.0",
           "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
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 45debbd10be..3e74306fbd0 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)",
+      "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)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)-f2624eb417fc2a933301bad7d7d05a012dd774a8",
           "rule_relevance": 100,
           "rule_url": null,
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 3953104d402..6a91488fc13 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 0d8f36016d9..5538c00a638 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
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 b29d079af3f..dabb9faead6 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 899821401c6..36940b793bf 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 21960ea467c..4bfc2ed2c8e 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0 AND lgpl-2.1",
+      "license_expression_spdx": "GPL-2.0-only AND LGPL-2.1-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 AND lgpl-2.1",
+          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.1-only",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 AND lgpl-2.1-89e25548a98f2cc78ea3207284de00386e9cca56",
           "rule_relevance": 100,
           "rule_url": null,
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 966281fe07b..f97f47e514a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 6f4aeb0f882..bed393ad7e0 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 9805be30087..58cb953ab8e 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "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)",
+      "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)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-(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)-3017fe0de3ce4010ecfd72d730a3209c094143fb",
           "rule_relevance": 100,
           "rule_url": null,
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 7be5b8a5ef3..4dcfbb4a76b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
           "rule_url": null,
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 0dc7b4a7d47..9eb4048d963 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "(lgpl-2.1 OR lgpl-3.0) AND lgpl-2.0-plus",
+      "license_expression_spdx": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-(lgpl-2.1 OR lgpl-3.0) AND lgpl-2.0-plus-7dea9e47d5bf4a2a09cf2f861f69abe368ccb3f4",
           "rule_relevance": 100,
           "rule_url": null,
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 6e42033c802..60924407a13 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 OR (lgpl-3.0 AND gpl-2.0)",
+      "license_expression_spdx": "LGPL-2.1-only OR (LGPL-3.0-only AND GPL-2.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR (lgpl-3.0 AND gpl-2.0)-534186cd80fee338c6272bb9dda85611148c66e8",
           "rule_relevance": 100,
           "rule_url": null,
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 9aefe28002d..965bbe8db20 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
           "rule_url": null,
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 697d4bf6054..9edab3a014b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 e5f46a318fb..34d3b0b05aa 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "kde-accepted-gpl AND 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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-kde-accepted-gpl AND kde-accepted-lgpl AND cc0-1.0-6a9624535224bcf1a0f54065c5d93440ca135f98",
           "rule_relevance": 100,
           "rule_url": null,
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 bf64721271d..e93ff9a0f52 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0 OR gpl-3.0",
+      "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0 OR gpl-3.0",
+          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
           "rule_identifier": "spdx-license-identifier-gpl-2.0 OR gpl-3.0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_relevance": 100,
           "rule_url": null,
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 fcd9970c586..bc6ac8d0107 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 AND lgpl-3.0)",
+      "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 AND lgpl-3.0)-2cb11bcdf63224f750de9a8729634e1605256e50",
           "rule_relevance": 100,
           "rule_url": null,
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 adfaadac9c2..07affdea67c 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 03c28b593cc..e761aee77be 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "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",
+      "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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-(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-03672b2a90402ac498ea76c8d3bb32c9fc13e415",
           "rule_relevance": 100,
           "rule_url": null,
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 e4a053f7a78..e7c703db621 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 9a9d4950112..61cefd7c6ac 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 d5a62410e93..edb07d59c68 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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)",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_relevance": 100,
           "rule_url": null,
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 dce751ac85f..eb888a83a82 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "kde-accepted-lgpl AND kfqf-accepted-gpl",
+      "license_expression_spdx": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "kde-accepted-lgpl AND kfqf-accepted-gpl",
+          "spdx_license_expression": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl",
           "rule_identifier": "spdx-license-identifier-kde-accepted-lgpl AND kfqf-accepted-gpl-d97defd08863e41010f561c03741f2df5e14dc33",
           "rule_relevance": 100,
           "rule_url": null,
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 178f7937f7e..d37d40f090d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_relevance": 100,
           "rule_url": null,
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 948719f4b63..49d35829d0e 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "spdx_license_expression": "GPL-3.0-only",
           "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
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 a6bed4d3be7..05ca02956d9 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-plus AND gpl-2.0",
+      "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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-plus AND gpl-2.0-77bf3be68b89b9db5231f68196e7824e08107db0",
           "rule_relevance": 100,
           "rule_url": null,
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 aae7f53ce07..79a4dc9a3ff 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 89349c47575..1b950bd84e3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 12f3dde97a9..572ff7046c4 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_lgpl-2.0-or-later_for_lgpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.0-or-later_for_lgpl-2.0-plus.RULE",
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 b6bc4a320a9..f2272866281 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 a8ef481d7b3..99bc1265341 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 b6952268895..1e8cf2fc1d9 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 d75a234c0cc..5516e225b6a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 0d7ba398210..77d6ffd871a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 28d7ed7a2f4..25cc70c8554 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-simplified",
+      "license_expression_spdx": "BSD-2-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-simplified",
+          "spdx_license_expression": "BSD-2-Clause",
           "rule_identifier": "spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE",
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 2d3fc80f927..f360ee94833 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "spdx-license-identifier-public-domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_relevance": 100,
           "rule_url": null,
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 e5866c898bb..0641c821229 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "spdx-license-identifier-public-domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_relevance": 100,
           "rule_url": null,
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 7ff43594f7c..1425348a540 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
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 b2d3b29315d..2c014e33926 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "unknown-license-reference AND isc",
+      "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference AND ISC",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "unknown-license-reference AND isc",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference AND ISC",
           "rule_identifier": "spdx-license-identifier-unknown-license-reference AND isc-931c1a1fdf45228cefb05b09f05449a73fc24287",
           "rule_relevance": 100,
           "rule_url": null,
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 4e029acc0b8..2db349db8d4 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "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",
+      "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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-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-4c618cc2365d2d36360f002752b2a7dfb8e338a4",
           "rule_relevance": 100,
           "rule_url": null,
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 3d58da47ce9..744116bd9b1 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 87062bcdd33..a8b4382de51 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 422aac21c57..591e7f1d67b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 ca4c5e6071b..00eb86cdf44 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 fccb4233d45..966f1077fb8 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 5d21a320e65..9901f9e492b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus AND mit AND lgpl-2.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later AND MIT AND LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-1.0-plus AND mit AND lgpl-2.0-plus-08bcf9f42fc4cda4bfb36c1191bb03b3121a3b3f",
           "rule_relevance": 100,
           "rule_url": null,
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 161e2365f47..7c0a7880a29 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "unknown-license-reference",
+      "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "unknown-license-reference",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "spdx-license-identifier-unknown-license-reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_relevance": 100,
           "rule_url": null,
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 2b6296e54a2..e4f6a8da663 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "isc",
+      "license_expression_spdx": "ISC",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "isc",
+          "spdx_license_expression": "ISC",
           "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
           "rule_relevance": 100,
           "rule_url": null,
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 d7d65cb113a..062f591a81a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 340288e0db3..f6879798083 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 e38fdb7de61..34226abf52f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 20e14da86ec..783d1f29a56 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "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",
+      "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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-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-64f2ebe21c0b7e185e837ac00b9ccd756d3654c7",
           "rule_relevance": 100,
           "rule_url": null,
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 220147a6fcf..15c463be0e3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "boost-1.0",
+          "spdx_license_expression": "BSL-1.0",
           "rule_identifier": "boost-1.0_48.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE",
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 f1bd9cd2d03..d573365c106 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
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 33cd22b8871..e0bfb283ec3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 fc294bef462..4fc0b8ccb74 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "spdx_license_expression": "GPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
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 8e21906b605..bde2ecf8d30 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus AND lgpl-2.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later AND LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-1.0-plus AND lgpl-2.0-plus-6ea1d8adc0d312a579c952366c5f2ceea876266b",
           "rule_relevance": 100,
           "rule_url": null,
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 5c54e44df16..09dc27c77f0 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "spdx_license_expression": "GPL-3.0-only",
           "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
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 91493d80386..c74c1616022 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "imagemagick",
+      "license_expression_spdx": "ImageMagick",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "imagemagick",
+          "spdx_license_expression": "ImageMagick",
           "rule_identifier": "spdx-license-identifier-imagemagick-0dd8f5c123a82d3e8b7c6d577c371911a89076bb",
           "rule_relevance": 100,
           "rule_url": null,
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 de7c61bd780..bfad352408a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 dbc31bb0b0c..57b27ff9395 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 1d3dc8e13fc..32012d0ef54 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 6446cb95d35..6a091b1c7c6 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "classpath-exception-2.0",
+      "license_expression_spdx": "Classpath-exception-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "classpath-exception-2.0",
+          "spdx_license_expression": "Classpath-exception-2.0",
           "rule_identifier": "classpath-exception-2.0_6.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/classpath-exception-2.0_6.RULE",
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 71f0d5b38da..b36cef29ea7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-3.0-plus",
+      "license_expression_spdx": "LGPL-3.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-3.0-plus",
+          "spdx_license_expression": "LGPL-3.0-or-later",
           "rule_identifier": "spdx_license_id_lgpl-3.0-or-later_for_lgpl-3.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-3.0-or-later_for_lgpl-3.0-plus.RULE",
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 17e195ee93d..f9161018e65 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 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",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_relevance": 100,
           "rule_url": null,
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 306d29ce032..2957134f73b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
           "rule_relevance": 100,
           "rule_url": null,
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 b363c54f2d3..685da43b908 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "unicode-dfs-2015",
+      "license_expression_spdx": "Unicode-DFS-2015",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "unicode-dfs-2015",
+          "spdx_license_expression": "Unicode-DFS-2015",
           "rule_identifier": "spdx_license_id_unicode-dfs-2015_for_unicode-dfs-2015.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_unicode-dfs-2015_for_unicode-dfs-2015.RULE",
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 fb9bced430c..5b847bdc162 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 60bc48bc021..c6218d4d5c7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
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 a4cc2a1c594..0e40cb758f2 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus",
+      "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "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",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
           "rule_url": null,
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 4d2e888ddb1..f6a1b53a2fe 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit AND x11 AND unicode-tou",
+      "license_expression_spdx": "MIT AND ICU AND Unicode-TOU",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit AND x11 AND unicode-tou",
+          "spdx_license_expression": "MIT AND ICU AND Unicode-TOU",
           "rule_identifier": "spdx-license-identifier-mit AND x11 AND unicode-tou-04c03ffc5d87121ab71914d00034fdd4a46eb02c",
           "rule_relevance": 100,
           "rule_url": null,
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 1d47812971d..35d9a482b7c 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "ruby AND bsd-simplified AND mit",
+      "license_expression_spdx": "Ruby AND BSD-2-Clause AND MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "ruby AND bsd-simplified AND mit",
+          "spdx_license_expression": "Ruby AND BSD-2-Clause AND MIT",
           "rule_identifier": "spdx-license-identifier-ruby AND bsd-simplified AND mit-41ebb50cee7db0cae90eea02dcf774f353e5566e",
           "rule_relevance": 100,
           "rule_url": null,
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 7a4a134b77f..4a085574a4d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "boost-1.0",
+          "spdx_license_expression": "BSL-1.0",
           "rule_identifier": "boost-1.0_48.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE",
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 480319a7fc3..c6122f1eb39 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "unknown-license-reference",
+      "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "unknown-license-reference",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "spdx-license-identifier-unknown-license-reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_relevance": 100,
           "rule_url": null,
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 2e05956c308..7da9b3aa53d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
           "rule_relevance": 100,
           "rule_url": null,
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 349fb5c7641..33e2cc4cf8d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus OR artistic-perl-1.0",
+      "license_expression_spdx": "GPL-1.0-or-later OR Artistic-1.0-Perl",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-1.0-plus OR artistic-perl-1.0",
+          "spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0-Perl",
           "rule_identifier": "spdx-license-identifier-gpl-1.0-plus OR artistic-perl-1.0-535d84b5d1aa6e65995199385dd4e21954d8d8ba",
           "rule_relevance": 100,
           "rule_url": null,
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 a60bdbf4098..f766c13f4cd 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "boost-1.0",
+          "spdx_license_expression": "BSL-1.0",
           "rule_identifier": "boost-1.0_48.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE",
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 4f53bebc5cd..7a9bb4c4651 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 8fa8e61f1e1..d477574248d 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
           "rule_relevance": 100,
           "rule_url": null,
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 926ff8545bd..f6d2d9c0ed7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-or-later_for_lgpl-2.1-plus.RULE",
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 80364b607bd..bf10a282285 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
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 50c8cbd6e76..a83c0cd7a40 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "matches": [
         {
           "score": 50.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
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 9c9df480272..115c8a8e56a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
diff --git a/tests/packagedcode/data/alpine/full-installed/installed-expected.json b/tests/packagedcode/data/alpine/full-installed/installed-expected.json
index 3af5edda741..b54c7dbc6d7 100644
--- a/tests/packagedcode/data/alpine/full-installed/installed-expected.json
+++ b/tests/packagedcode/data/alpine/full-installed/installed-expected.json
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -132,6 +134,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -142,6 +145,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -271,6 +275,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -281,6 +286,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -590,6 +596,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -600,6 +607,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -846,6 +854,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -856,6 +865,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1030,6 +1040,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -1040,6 +1051,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1124,6 +1136,7 @@
     "license_detections": [
       {
         "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+        "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -1134,6 +1147,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
             "rule_identifier": "spdx-license-identifier-mpl-2.0 AND gpl-2.0-plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1210,6 +1224,7 @@
     "license_detections": [
       {
         "license_expression": "isc",
+        "license_expression_spdx": "ISC",
         "matches": [
           {
             "score": 100.0,
@@ -1220,6 +1235,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "isc",
+            "spdx_license_expression": "ISC",
             "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1315,6 +1331,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1325,6 +1342,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1400,6 +1418,7 @@
     "license_detections": [
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 100.0,
@@ -1410,6 +1429,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1494,6 +1514,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1504,6 +1525,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1579,6 +1601,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1589,6 +1612,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1664,6 +1688,7 @@
     "license_detections": [
       {
         "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+        "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -1674,6 +1699,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "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",
             "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1796,6 +1822,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-simplified AND bsd-new",
+        "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -1806,6 +1833,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "bsd-simplified AND bsd-new",
+            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
             "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_relevance": 100,
             "rule_url": null,
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 2f842f61656..d170fa7c5c9 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
@@ -39,6 +39,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -49,6 +50,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -130,6 +132,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -140,6 +143,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -221,6 +225,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -231,6 +236,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -339,6 +345,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -349,6 +356,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -592,6 +600,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0 AND mit",
+          "license_expression_spdx": "MPL-2.0 AND MIT",
           "matches": [
             {
               "score": 100.0,
@@ -602,6 +611,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mpl-2.0 AND mit",
+              "spdx_license_expression": "MPL-2.0 AND MIT",
               "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_relevance": 100,
               "rule_url": null,
@@ -683,6 +693,7 @@
       "license_detections": [
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -693,6 +704,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
               "rule_url": null,
@@ -801,6 +813,7 @@
       "license_detections": [
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -811,6 +824,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
               "rule_url": null,
@@ -892,6 +906,7 @@
       "license_detections": [
         {
           "license_expression": "isc AND (bsd-new OR mit)",
+          "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)",
           "matches": [
             {
               "score": 100.0,
@@ -902,6 +917,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "isc AND (bsd-new OR mit)",
+              "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
               "rule_identifier": "spdx-license-identifier-isc AND (bsd-new OR mit)-7471dfe24fdc3b7a8943273ac320469f644d2688",
               "rule_relevance": 100,
               "rule_url": null,
@@ -983,6 +999,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -993,6 +1010,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1062,6 +1080,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1072,6 +1091,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1153,6 +1173,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1163,6 +1184,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1232,6 +1254,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1242,6 +1265,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1311,6 +1335,7 @@
       "license_detections": [
         {
           "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+          "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -1321,6 +1346,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1390,6 +1416,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-simplified AND bsd-new",
+          "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1400,6 +1427,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "bsd-simplified AND bsd-new",
+              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
               "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_relevance": 100,
               "rule_url": null,
@@ -2172,6 +2200,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -2182,6 +2211,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -2266,6 +2296,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -2276,6 +2307,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -2405,6 +2437,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -2415,6 +2448,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -2733,6 +2767,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -2743,6 +2778,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3178,6 +3214,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0 AND mit",
+              "license_expression_spdx": "MPL-2.0 AND MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -3188,6 +3225,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mpl-2.0 AND mit",
+                  "spdx_license_expression": "MPL-2.0 AND MIT",
                   "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3272,6 +3310,7 @@
           "license_detections": [
             {
               "license_expression": "openssl-ssleay",
+              "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
                   "score": 100.0,
@@ -3282,6 +3321,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
                   "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3447,6 +3487,7 @@
           "license_detections": [
             {
               "license_expression": "openssl-ssleay",
+              "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
                   "score": 100.0,
@@ -3457,6 +3498,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
                   "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3541,6 +3583,7 @@
           "license_detections": [
             {
               "license_expression": "isc AND (bsd-new OR mit)",
+              "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)",
               "matches": [
                 {
                   "score": 100.0,
@@ -3551,6 +3594,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "isc AND (bsd-new OR mit)",
+                  "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
                   "rule_identifier": "spdx-license-identifier-isc AND (bsd-new OR mit)-7471dfe24fdc3b7a8943273ac320469f644d2688",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3646,6 +3690,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3656,6 +3701,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -3731,6 +3777,7 @@
           "license_detections": [
             {
               "license_expression": "zlib",
+              "license_expression_spdx": "Zlib",
               "matches": [
                 {
                   "score": 100.0,
@@ -3741,6 +3788,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -3825,6 +3873,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3835,6 +3884,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -3940,6 +3990,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -3950,6 +4001,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -4025,6 +4077,7 @@
           "license_detections": [
             {
               "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+              "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -4035,6 +4088,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "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",
                   "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -4157,6 +4211,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-simplified AND bsd-new",
+              "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -4167,6 +4222,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "bsd-simplified AND bsd-new",
+                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
                   "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/alpine/single-installed/installed-expected.json b/tests/packagedcode/data/alpine/single-installed/installed-expected.json
index 5a3a586203d..f8e6a1fc88b 100644
--- a/tests/packagedcode/data/alpine/single-installed/installed-expected.json
+++ b/tests/packagedcode/data/alpine/single-installed/installed-expected.json
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
diff --git a/tests/packagedcode/data/alpine/small-installed/installed-expected.json b/tests/packagedcode/data/alpine/small-installed/installed-expected.json
index 59812707bca..b9322ba2823 100644
--- a/tests/packagedcode/data/alpine/small-installed/installed-expected.json
+++ b/tests/packagedcode/data/alpine/small-installed/installed-expected.json
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -132,6 +134,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -142,6 +145,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -271,6 +275,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -281,6 +286,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -590,6 +596,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -600,6 +607,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
             "rule_url": null,
@@ -828,6 +836,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -838,6 +847,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1012,6 +1022,7 @@
     "license_detections": [
       {
         "license_expression": "openssl-ssleay",
+        "license_expression_spdx": "OpenSSL",
         "matches": [
           {
             "score": 100.0,
@@ -1022,6 +1033,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
             "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1106,6 +1118,7 @@
     "license_detections": [
       {
         "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+        "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -1116,6 +1129,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
             "rule_identifier": "spdx-license-identifier-mpl-2.0 AND gpl-2.0-plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1183,6 +1197,7 @@
     "license_detections": [
       {
         "license_expression": "isc",
+        "license_expression_spdx": "ISC",
         "matches": [
           {
             "score": 100.0,
@@ -1193,6 +1208,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "isc",
+            "spdx_license_expression": "ISC",
             "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1288,6 +1304,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1298,6 +1315,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1373,6 +1391,7 @@
     "license_detections": [
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 100.0,
@@ -1383,6 +1402,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1467,6 +1487,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 50.0,
@@ -1477,6 +1498,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl2_bare_word_only.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl2_bare_word_only.RULE",
@@ -1552,6 +1574,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -1562,6 +1585,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
@@ -1637,6 +1661,7 @@
     "license_detections": [
       {
         "license_expression": "mit AND bsd-new AND gpl-2.0-plus",
+        "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -1647,6 +1672,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "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",
             "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1769,6 +1795,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -1779,6 +1806,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
diff --git a/tests/packagedcode/data/bower/author-objects/expected.json b/tests/packagedcode/data/bower/author-objects/expected.json
index e24ee29bfe9..f2e1c7f3ef8 100644
--- a/tests/packagedcode/data/bower/author-objects/expected.json
+++ b/tests/packagedcode/data/bower/author-objects/expected.json
@@ -47,6 +47,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -57,6 +58,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -67,6 +69,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -77,6 +80,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -87,6 +91,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -97,6 +102,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
diff --git a/tests/packagedcode/data/bower/basic/expected.json b/tests/packagedcode/data/bower/basic/expected.json
index b7d761f6512..a822fa36e56 100644
--- a/tests/packagedcode/data/bower/basic/expected.json
+++ b/tests/packagedcode/data/bower/basic/expected.json
@@ -40,6 +40,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -50,6 +51,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/bower/list-of-licenses/expected.json b/tests/packagedcode/data/bower/list-of-licenses/expected.json
index 584ab696a50..5da76ef57b6 100644
--- a/tests/packagedcode/data/bower/list-of-licenses/expected.json
+++ b/tests/packagedcode/data/bower/list-of-licenses/expected.json
@@ -40,6 +40,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -50,6 +51,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -60,6 +62,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -70,6 +73,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -80,6 +84,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -90,6 +95,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
diff --git a/tests/packagedcode/data/bower/scan-expected.json b/tests/packagedcode/data/bower/scan-expected.json
index cc67727af06..3473a114c27 100644
--- a/tests/packagedcode/data/bower/scan-expected.json
+++ b/tests/packagedcode/data/bower/scan-expected.json
@@ -48,6 +48,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -58,6 +59,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -68,6 +70,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -78,6 +81,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -88,6 +92,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -98,6 +103,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -231,6 +237,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -241,6 +248,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -251,6 +259,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -261,6 +270,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -271,6 +281,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -281,6 +292,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
diff --git a/tests/packagedcode/data/build/buck/end2end-expected.json b/tests/packagedcode/data/build/buck/end2end-expected.json
index d537d90955c..866de9f3c62 100644
--- a/tests/packagedcode/data/build/buck/end2end-expected.json
+++ b/tests/packagedcode/data/build/buck/end2end-expected.json
@@ -75,6 +75,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -85,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 25fd9d59ebc..fc87d164f1a 100644
--- a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected
+++ b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 b153bfa63c8..a8585508038 100644
--- a/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected
+++ b/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected
@@ -64,6 +64,7 @@
     "license_detections": [
       {
         "license_expression": "mit OR apache-2.0",
+        "license_expression_spdx": "MIT OR Apache-2.0",
         "matches": [
           {
             "score": 99.0,
@@ -74,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit OR apache-2.0",
+            "spdx_license_expression": "MIT OR Apache-2.0",
             "rule_identifier": "mit_or_apache-2.0_1.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_1.RULE",
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 ab4869bf09b..120a987ea56 100644
--- a/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected
+++ b/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "mpl-2.0",
+        "license_expression_spdx": "MPL-2.0",
         "matches": [
           {
             "score": 50.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mpl-2.0",
+            "spdx_license_expression": "MPL-2.0",
             "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
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 3d7405ccc43..34f798d0394 100644
--- a/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected
+++ b/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0 OR mit",
+        "license_expression_spdx": "Apache-2.0 OR MIT",
         "matches": [
           {
             "score": 99.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0 OR mit",
+            "spdx_license_expression": "Apache-2.0 OR MIT",
             "rule_identifier": "apache-2.0_or_mit_48.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_48.RULE",
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 e7cfaa1d511..52724647f07 100644
--- a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected
+++ b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit OR apache-2.0",
+        "license_expression_spdx": "MIT OR Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit OR apache-2.0",
+            "spdx_license_expression": "MIT OR Apache-2.0",
             "rule_identifier": "mit_or_apache-2.0_15.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json
index 16f01cce9fd..9296b7a1f34 100644
--- a/tests/packagedcode/data/cargo/scan.expected.json
+++ b/tests/packagedcode/data/cargo/scan.expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
@@ -119,6 +121,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -129,6 +132,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
               "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
@@ -766,6 +770,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 50.0,
@@ -776,6 +781,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
@@ -861,6 +867,7 @@
           "license_detections": [
             {
               "license_expression": "mit OR apache-2.0",
+              "license_expression_spdx": "MIT OR Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -871,6 +878,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit OR apache-2.0",
+                  "spdx_license_expression": "MIT OR Apache-2.0",
                   "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
diff --git a/tests/packagedcode/data/chef/basic/metadata.json.expected b/tests/packagedcode/data/chef/basic/metadata.json.expected
index aacbaa3ee86..c07e50b4e30 100644
--- a/tests/packagedcode/data/chef/basic/metadata.json.expected
+++ b/tests/packagedcode/data/chef/basic/metadata.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/chef/basic/metadata.rb.expected b/tests/packagedcode/data/chef/basic/metadata.rb.expected
index df78d1ca8bd..4d16b005d9d 100644
--- a/tests/packagedcode/data/chef/basic/metadata.rb.expected
+++ b/tests/packagedcode/data/chef/basic/metadata.rb.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/chef/basic/test_package.json.expected b/tests/packagedcode/data/chef/basic/test_package.json.expected
index 33410d06801..ec4e1ae1213 100644
--- a/tests/packagedcode/data/chef/basic/test_package.json.expected
+++ b/tests/packagedcode/data/chef/basic/test_package.json.expected
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 7f2b0f81766..28ef05e3556 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 aa776c3db92..030f6f5550e 100644
--- a/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected
+++ b/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 dec64bb0292..1be3d365f22 100644
--- a/tests/packagedcode/data/chef/basic/test_package_parties.json.expected
+++ b/tests/packagedcode/data/chef/basic/test_package_parties.json.expected
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 70.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
diff --git a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected
index 642319e3a2e..274497fa62f 100644
--- a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected
+++ b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
diff --git a/tests/packagedcode/data/chef/package.scan.expected.json b/tests/packagedcode/data/chef/package.scan.expected.json
index d4b31392b54..8bf1db0cf06 100644
--- a/tests/packagedcode/data/chef/package.scan.expected.json
+++ b/tests/packagedcode/data/chef/package.scan.expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -157,6 +159,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -167,6 +170,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -249,6 +253,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -259,6 +264,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
index 53b23879b57..da0bc6d969c 100644
--- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -187,6 +191,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -197,6 +202,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -262,6 +268,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -272,6 +279,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -337,6 +345,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -347,6 +356,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -412,6 +422,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -422,6 +433,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -614,6 +626,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -624,6 +637,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -695,6 +709,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -705,6 +720,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -776,6 +792,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -786,6 +803,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -857,6 +875,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -867,6 +886,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -938,6 +958,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -948,6 +969,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -1019,6 +1041,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1029,6 +1052,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
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 7c1c8aa12b6..053078ca666 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -187,6 +191,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -197,6 +202,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -262,6 +268,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -272,6 +279,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -337,6 +345,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -347,6 +356,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -412,6 +422,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -422,6 +433,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -569,6 +581,7 @@
     {
       "identifier": "apache_2_0-428c1364-ecb5-f806-7a2e-77d10737a7ce",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
       "sample_matches": [
         {
@@ -580,6 +593,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -590,6 +604,7 @@
     {
       "identifier": "apache_2_0-d310abb3-4d20-b3be-830d-ee37b30a997f",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
       "sample_matches": [
         {
@@ -601,6 +616,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_68.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE",
@@ -611,6 +627,7 @@
     {
       "identifier": "apache_2_0-08479bef-4de5-8be8-0987-1bec0c232b20",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -622,6 +639,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_70.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE",
@@ -684,6 +702,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -694,6 +713,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -727,6 +747,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -737,6 +758,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -790,6 +812,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -800,6 +823,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -833,6 +857,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -843,6 +868,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -896,6 +922,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -906,6 +933,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -939,6 +967,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -949,6 +978,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -1002,6 +1032,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1012,6 +1043,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -1045,6 +1077,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1055,6 +1088,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -1108,6 +1142,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1118,6 +1153,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -1151,6 +1187,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1161,6 +1198,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -1214,6 +1252,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1224,6 +1263,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -1257,6 +1297,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1267,6 +1308,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
@@ -1312,6 +1354,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1322,6 +1365,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_70.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
@@ -1389,6 +1433,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1399,6 +1444,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_70.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
@@ -1524,6 +1570,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1534,6 +1581,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_70.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
diff --git a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
index b8db597e8ff..736a1e14f19 100644
--- a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -244,6 +248,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -254,6 +259,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -460,6 +466,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -470,6 +477,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
index c5ecde8ac5d..c809dd28693 100644
--- a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -304,6 +306,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -314,6 +317,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
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 3bea8bbbd42..1fbcab6aedc 100644
--- a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -119,6 +121,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -129,6 +132,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
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 b11a1b7d51e..e933d8e958b 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-d2754fbb513aa8b758a4d140049dd6bef0aedd05",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-d2754fbb513aa8b758a4d140049dd6bef0aedd05",
diff --git a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json
index dc8311069fd..93b6bf1083b 100644
--- a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_in_manifest.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_in_manifest.RULE",
diff --git a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json
index b3b83005048..897962b47db 100644
--- a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_in_manifest.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_in_manifest.RULE",
diff --git a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json
index 633d3fa6843..a85a021279e 100644
--- a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json
index e25fda912b5..0e86af9794a 100644
--- a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json
index a28f2d198ed..8f88504461a 100644
--- a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_48.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
diff --git a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json
index 255ba4e0b56..1c3e2e34ce0 100644
--- a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_in_manifest.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_in_manifest.RULE",
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 5827263af35..175b1657f04 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown-license-reference",
+        "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "unknown-license-reference",
+            "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
             "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
diff --git a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json
index 332140aade1..be7c37f7c22 100644
--- a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_in_manifest.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_in_manifest.RULE",
diff --git a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json
index c9e51c7990f..eb04492b6ce 100644
--- a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json
+++ b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "zlib_in_manifest.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
diff --git a/tests/packagedcode/data/conda/meta.yaml.expected.json b/tests/packagedcode/data/conda/meta.yaml.expected.json
index 0ab02e88c62..9fb3cdbfcbb 100644
--- a/tests/packagedcode/data/conda/meta.yaml.expected.json
+++ b/tests/packagedcode/data/conda/meta.yaml.expected.json
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_292.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_292.RULE",
diff --git a/tests/packagedcode/data/cran/codetools/package.json.expected b/tests/packagedcode/data/cran/codetools/package.json.expected
index ac9e5138018..aa9ce12214b 100644
--- a/tests/packagedcode/data/cran/codetools/package.json.expected
+++ b/tests/packagedcode/data/cran/codetools/package.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 50.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl_bare_word_only.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
diff --git a/tests/packagedcode/data/cran/geometry/package.json.expected b/tests/packagedcode/data/cran/geometry/package.json.expected
index 52ab1da708b..06edd977803 100644
--- a/tests/packagedcode/data/cran/geometry/package.json.expected
+++ b/tests/packagedcode/data/cran/geometry/package.json.expected
@@ -85,6 +85,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -95,6 +96,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "gpl-3.0_25.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_25.RULE",
diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json
index 635617d3c9c..aa10b59701b 100644
--- a/tests/packagedcode/data/debian/basic-rootfs-expected.json
+++ b/tests/packagedcode/data/debian/basic-rootfs-expected.json
@@ -41,6 +41,7 @@
       "license_detections": [
         {
           "license_expression": "x11-fsf",
+          "license_expression_spdx": "X11-distribute-modifications-variant",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +52,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-fsf",
+              "spdx_license_expression": "X11-distribute-modifications-variant",
               "rule_identifier": "x11-fsf.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -61,6 +63,7 @@
         },
         {
           "license_expression": "x11-xconsortium",
+          "license_expression_spdx": "X11",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +74,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
               "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -81,6 +85,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -91,6 +96,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -101,6 +107,7 @@
         },
         {
           "license_expression": "x11-xconsortium",
+          "license_expression_spdx": "X11",
           "matches": [
             {
               "score": 100.0,
@@ -111,6 +118,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
               "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -229,6 +237,7 @@
       "other_license_detections": [
         {
           "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+          "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
           "matches": [
             {
               "score": 100.0,
@@ -239,6 +248,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -253,6 +263,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -267,6 +278,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
               "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
@@ -391,6 +403,7 @@
           "license_detections": [
             {
               "license_expression": "x11-fsf",
+              "license_expression_spdx": "X11-distribute-modifications-variant",
               "matches": [
                 {
                   "score": 100.0,
@@ -401,6 +414,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-fsf",
+                  "spdx_license_expression": "X11-distribute-modifications-variant",
                   "rule_identifier": "x11-fsf.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -411,6 +425,7 @@
             },
             {
               "license_expression": "x11-xconsortium",
+              "license_expression_spdx": "X11",
               "matches": [
                 {
                   "score": 100.0,
@@ -421,6 +436,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
                   "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -431,6 +447,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -441,6 +458,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_19.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -451,6 +469,7 @@
             },
             {
               "license_expression": "x11-xconsortium",
+              "license_expression_spdx": "X11",
               "matches": [
                 {
                   "score": 100.0,
@@ -461,6 +480,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
                   "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -534,6 +554,7 @@
           "other_license_detections": [
             {
               "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+              "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -544,6 +565,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -558,6 +580,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -572,6 +595,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1",
+                  "spdx_license_expression": "LGPL-2.1-only",
                   "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
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 2130623ab94..be446327d95 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
@@ -9,6 +9,7 @@ other_license_expression_spdx: MIT AND MIT
 license_detections: []
 other_license_detections:
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 16
@@ -18,6 +19,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 1edf82722d6..02c90368dd8 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
@@ -46,6 +46,7 @@ other_license_expression_spdx: (Apache-2.0 AND Apache-2.0) AND ((Apache-2.0 AND
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 71
@@ -55,6 +56,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -67,6 +69,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_971.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_971.RULE
@@ -90,6 +93,7 @@ other_license_detections:
           be found in the file `/usr/share/common-licenses/Apache-2.0'.
     identifier: apache_2_0-54a3cb61-dd1f-a43e-0748-862fb858b0d2
   - license_expression: zeusbench
+    license_expression_spdx: LicenseRef-scancode-zeusbench
     matches:
       - score: '100.0'
         start_line: 94
@@ -99,6 +103,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zeusbench
+        spdx_license_expression: LicenseRef-scancode-zeusbench
         rule_identifier: zeusbench_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zeusbench_1.RULE
@@ -115,6 +120,7 @@ other_license_detections:
             possibility of such damage
     identifier: zeusbench-015480ab-358c-46e9-b585-8bc7330ace50
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 118
@@ -124,6 +130,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
@@ -155,6 +162,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bd6a26eb-db9d-de45-5d56-8c5674ddfb3f
   - license_expression: x11-keith-packard AND metamail
+    license_expression_spdx: HPND-sell-variant AND metamail
     matches:
       - score: '100.0'
         start_line: 172
@@ -164,6 +172,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-keith-packard
+        spdx_license_expression: HPND-sell-variant
         rule_identifier: x11-keith-packard3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-keith-packard3.RULE
@@ -196,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: metamail
+        spdx_license_expression: metamail
         rule_identifier: metamail.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
@@ -212,6 +222,7 @@ other_license_detections:
           WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
     identifier: x11_keith_packard_and_metamail-34a511f5-3e81-16a2-de12-7fbbb7e0f5c7
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 209
@@ -221,6 +232,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -233,6 +245,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_483.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_483.RULE
@@ -252,6 +265,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-19d9def9-e12c-2282-ca9d-6b65b77eb924
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 224
@@ -261,6 +275,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -273,6 +288,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_986.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_986.RULE
@@ -292,6 +308,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-54a2dc03-8069-9f58-8fd2-21a866d843f8
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 240
@@ -301,6 +318,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_361.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_361.RULE
@@ -340,6 +358,7 @@ other_license_detections:
           Mark Cox, mark@ukweb.com, Allow relative URLs even when no base specified
     identifier: public_domain-a7ae1690-4f60-4902-e6d2-15dc3a028b4c
   - license_expression: bsd-simplified-darwin
+    license_expression_spdx: LicenseRef-scancode-bsd-simplified-darwin
     matches:
       - score: '100.0'
         start_line: 279
@@ -349,6 +368,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified-darwin
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
         rule_identifier: bsd-simplified-darwin.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE
@@ -379,6 +399,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified_darwin-9a2496b0-cc3a-2546-8280-ca8b6b3383c6
   - license_expression: apache-2.0 AND hs-regexp
+    license_expression_spdx: Apache-2.0 AND Spencer-94
     matches:
       - score: '100.0'
         start_line: 306
@@ -388,6 +409,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1021.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1021.RULE
@@ -404,6 +426,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_1.RULE
@@ -429,6 +452,7 @@ other_license_detections:
           4. This notice may not be removed or altered.
     identifier: apache_2_0_and_hs_regexp-418b8fd9-1905-1ad7-6930-311a90aaf0a7
   - license_expression: bsd-unchanged
+    license_expression_spdx: LicenseRef-scancode-bsd-unchanged
     matches:
       - score: '100.0'
         start_line: 370
@@ -438,6 +462,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-unchanged
+        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
         rule_identifier: bsd-unchanged_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unchanged_4.RULE
@@ -466,6 +491,7 @@ other_license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_unchanged-b3a50ceb-2258-90d8-693d-32de170e8f80
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 395
@@ -475,6 +501,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
@@ -506,6 +533,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bd6a26eb-db9d-de45-5d56-8c5674ddfb3f
   - license_expression: bison-exception-2.2
+    license_expression_spdx: Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 422
@@ -515,6 +543,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
         rule_identifier: bison-exception-2.2.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bison-exception-2.2.LICENSE
@@ -533,6 +562,7 @@ other_license_detections:
             version 2.2 of Bison.  */
     identifier: bison_exception_2_2-b8782f6d-6348-8be8-bb53-4f79d1684277
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 439
@@ -542,6 +572,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 7e0572e41cf..1c90bf9754a 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
@@ -31,6 +31,7 @@ other_license_expression_spdx: ((GPL-2.0-or-later AND GPL-2.0-or-later) AND (LGP
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 67
@@ -40,6 +41,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -52,6 +54,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
@@ -73,6 +76,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-00217b75-1a81-9ffa-8aed-0d1bd2f9756b
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 84
@@ -82,6 +86,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -94,6 +99,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
@@ -118,6 +124,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
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 b00d5068995..a7495a11977 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
@@ -81,6 +81,7 @@ other_license_expression_spdx: GPL-2.0-only AND GPL-2.0-only AND GPL-2.0-only AN
 license_detections: []
 other_license_detections:
   - license_expression: autoconf-simple-exception-2.0
+    license_expression_spdx: Autoconf-exception-generic
     matches:
       - score: '100.0'
         start_line: 109
@@ -90,6 +91,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
         rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
@@ -100,6 +102,7 @@ other_license_detections:
           distribution terms that you use for the rest of that program.
     identifier: autoconf_simple_exception_2_0-9f49705d-f825-5107-3217-345df57f18c4
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 242
@@ -109,6 +112,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_492.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_492.RULE
@@ -117,6 +121,7 @@ other_license_detections:
           Arthur David Olson.
     identifier: public_domain-1f8bbf4c-14a2-f656-073e-b7f150683f85
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 296
@@ -126,6 +131,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_73.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_73.RULE
@@ -134,6 +140,7 @@ other_license_detections:
           kind.
     identifier: public_domain_disclaimer-55ffa672-4ca7-dee0-c2e7-272a0f534dea
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 314
@@ -143,12 +150,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_2.RULE
         matched_text: This code is released by the author with no restrictions on usage.
     identifier: other_permissive-f3b400be-ace2-fed7-d629-910346d268ab
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 333
@@ -158,6 +167,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_357.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_357.RULE
@@ -166,6 +176,7 @@ other_license_detections:
           redistribution.
     identifier: other_permissive-ddeff00e-f9b3-ce6d-ddf0-a5f456a285be
   - license_expression: bison-exception-2.2
+    license_expression_spdx: Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 361
@@ -175,6 +186,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
         rule_identifier: bison-exception-2.2_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bison-exception-2.2_2.RULE
@@ -190,6 +202,7 @@ other_license_detections:
           special exception.
     identifier: bison_exception_2_2-62db0610-72a0-b2fc-f701-b0b81629c32f
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 407
@@ -199,6 +212,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_303.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
@@ -207,6 +221,7 @@ other_license_detections:
           This code is in the public domain; do with it what you wish.
     identifier: public_domain-12604376-43c0-ec4b-0941-067570a4db40
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '96.07'
         start_line: 464
@@ -216,6 +231,7 @@ other_license_detections:
         match_coverage: '96.07'
         matcher: 3-seq
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1121.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1121.RULE
@@ -268,6 +284,7 @@ other_license_detections:
           steps you must take.
     identifier: gpl_2_0-3a84c865-d3ef-b5e3-0f84-3e3de333342d
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '80.0'
         start_line: 521
@@ -277,6 +294,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_17.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_17.RULE
@@ -293,6 +311,7 @@ other_license_detections:
           in all copies or substantial portions of the Software.
     identifier: mit-19e92631-4a50-0b43-f7f7-3c6b7d44ec18
   - license_expression: mit-0
+    license_expression_spdx: MIT-0
     matches:
       - score: '100.0'
         start_line: 533
@@ -302,6 +321,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit-0
+        spdx_license_expression: MIT-0
         rule_identifier: mit-0_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-0_7.RULE
@@ -323,6 +343,7 @@ other_license_detections:
           SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit_0-e97e8050-686d-72b3-c2a6-113468d402c0
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 550
@@ -332,6 +353,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
@@ -347,6 +369,7 @@ other_license_detections:
           It is provided "as is" without express or implied warranty.
     identifier: mit_old_style_no_advert-469a8f5b-14cb-1cf1-ac4f-fd7a23bb63e5
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 561
@@ -356,6 +379,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -385,6 +409,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ddbdf2af-d93f-9912-6c83-1167bb9d3f80
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 586
@@ -394,6 +419,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1015.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1015.RULE
@@ -423,6 +449,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-48383578-475e-5654-be6f-877cdb4e161f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 611
@@ -432,6 +459,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_49.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_49.RULE
@@ -463,6 +491,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-df894017-a635-e03d-12c4-50658ae65a4b
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 638
@@ -472,6 +501,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_30.RULE
@@ -506,6 +536,7 @@ other_license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_original_uc-95995244-8a5e-7b1d-621e-a9ab16cc826a
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 668
@@ -515,6 +546,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
@@ -550,6 +582,7 @@ other_license_detections:
           DAMAGE.
     identifier: bsd_original-07212ebb-4bc6-b4e9-de7c-a4d294184c21
   - license_expression: brian-clapper
+    license_expression_spdx: LicenseRef-scancode-brian-clapper
     matches:
       - score: '68.51'
         start_line: 699
@@ -559,6 +592,7 @@ other_license_detections:
         match_coverage: '68.51'
         matcher: 3-seq
         license_expression: brian-clapper
+        spdx_license_expression: LicenseRef-scancode-brian-clapper
         rule_identifier: brian-clapper.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/brian-clapper.LICENSE
@@ -586,6 +620,7 @@ other_license_detections:
           MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: brian_clapper-7c8f1880-18e3-227a-0c44-13ed19b3b5fc
   - license_expression: tu-berlin
+    license_expression_spdx: TU-Berlin-1.0
     matches:
       - score: '100.0'
         start_line: 722
@@ -595,6 +630,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: tu-berlin
+        spdx_license_expression: TU-Berlin-1.0
         rule_identifier: tu-berlin.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tu-berlin.LICENSE
@@ -611,6 +647,7 @@ other_license_detections:
           improvements that may be of general interest.
     identifier: tu_berlin-15bd3bf9-723b-4803-c7ef-1e76399dcbac
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '99.0'
         start_line: 734
@@ -620,6 +657,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_truncated.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_truncated.RULE
@@ -629,6 +667,7 @@ other_license_detections:
           copyright notice and this permission notice appear in all copies.
     identifier: isc-5f45f5f1-73e1-c745-cdd8-9491f9450d2d
   - license_expression: wol
+    license_expression_spdx: LicenseRef-scancode-wol
     matches:
       - score: '90.77'
         start_line: 739
@@ -638,6 +677,7 @@ other_license_detections:
         match_coverage: '90.77'
         matcher: 3-seq
         license_expression: wol
+        spdx_license_expression: LicenseRef-scancode-wol
         rule_identifier: wol.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/wol.LICENSE
@@ -651,6 +691,7 @@ other_license_detections:
           IMPLIED WARRANTY OF ANY KIND. See http://www.dspguru.com/
     identifier: wol-268a1b47-4ac9-4074-797d-6622b7de15ee
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 749
@@ -660,6 +701,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
@@ -668,6 +710,7 @@ other_license_detections:
           gives unlimited permission to copy, distribute and modify it.
     identifier: fsf_free-95bff5c5-ed9b-1c78-0dd8-4c05168176ba
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 94
@@ -677,12 +720,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_620.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_620.RULE
         matched_text: GPL-2
     identifier: gpl_2_0-73650a7c-ed7f-7e77-df4a-654c89d9a1a6
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 89
@@ -692,6 +737,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
@@ -701,6 +747,7 @@ other_license_detections:
            the source tree.
     identifier: gpl_2_0-43983640-24ee-7fcd-5762-77ac455bbaf7
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 104
@@ -710,6 +757,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
@@ -720,6 +768,7 @@ other_license_detections:
            later version.
     identifier: gpl_2_0_plus-b2201fb7-5a21-89a3-4ab2-5486f22b89aa
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '80.0'
         start_line: 145
@@ -729,12 +778,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 141
@@ -744,6 +795,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
@@ -752,6 +804,7 @@ other_license_detections:
            General Public License
     identifier: gpl_1_0_plus-df8dc57b-9ffe-5d74-afd6-5514ed17578c
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '80.0'
         start_line: 168
@@ -761,12 +814,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 165
@@ -776,12 +831,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
         matched_text: Distributed under the terms of the GNU General Public License
     identifier: gpl_1_0_plus-df8dc57b-9ffe-5d74-afd6-5514ed17578c
   - license_expression: unknown
+    license_expression_spdx: LicenseRef-scancode-unknown
     matches:
       - score: '100.0'
         start_line: 178
@@ -791,12 +848,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: unknown
+        spdx_license_expression: LicenseRef-scancode-unknown
         rule_identifier: unknown_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_9.RULE
         matched_text: 'License: none'
     identifier: unknown-f774baab-edec-ae58-59f7-6560caa7b354
   - license_expression: free-unknown
+    license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
       - score: '100.0'
         start_line: '194'
@@ -806,6 +865,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
         rule_identifier: free-unknown_109.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_109.RULE
@@ -816,6 +876,7 @@ other_license_detections:
            installation in the COPYING file.
     identifier: free_unknown-f1e785fc-6c3c-c65c-210c-f20466d01e3f
   - license_expression: unknown
+    license_expression_spdx: LicenseRef-scancode-unknown
     matches:
       - score: '100.0'
         start_line: 247
@@ -825,12 +886,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: unknown
+        spdx_license_expression: LicenseRef-scancode-unknown
         rule_identifier: unknown_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_9.RULE
         matched_text: 'License: none'
     identifier: unknown-f774baab-edec-ae58-59f7-6560caa7b354
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 249
@@ -840,6 +903,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_362.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_362.RULE
@@ -865,6 +929,7 @@ other_license_detections:
           See also .
     identifier: public_domain-8b03c0c6-7f43-0f68-f5ed-25816ff9abb5
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 277
@@ -874,6 +939,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_848.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_848.RULE
@@ -888,6 +954,7 @@ other_license_detections:
            fine. Please add the appropriate text to the file for me, in my name.
     identifier: gpl_2_0_plus-9a2b5cf4-1756-166b-792e-fd20299b5cca
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 324
@@ -897,6 +964,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -907,6 +975,7 @@ other_license_detections:
            option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 341
@@ -916,6 +985,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
@@ -925,6 +995,7 @@ other_license_detections:
            the source tree.
     identifier: gpl_2_0-43983640-24ee-7fcd-5762-77ac455bbaf7
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 356
@@ -934,6 +1005,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_7.RULE
@@ -944,6 +1016,7 @@ other_license_detections:
            option) any later version.
     identifier: gpl_3_0_plus-df55e3fd-7413-e35e-759e-e485d35d8709
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '80.0'
         start_line: 381
@@ -953,12 +1026,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 378
@@ -968,12 +1043,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_470.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_470.RULE
         matched_text: you may use this source under GPL terms!
     identifier: gpl_1_0_plus-02a5caf2-d20c-3df8-10d3-6013622398d3
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 387
@@ -983,6 +1060,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
@@ -992,6 +1070,7 @@ other_license_detections:
            the source tree.
     identifier: gpl_2_0-43983640-24ee-7fcd-5762-77ac455bbaf7
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '90.0'
         start_line: 402
@@ -1001,12 +1080,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_384.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_384.RULE
         matched_text: Version of LGPL license not mentioned.  Assumed to be version 2.1.
     identifier: lgpl_2_1-9d65d7eb-28e6-86d4-7cd1-3511a4874ff0
   - license_expression: gpl-2.0 OR lgpl-2.0-plus
+    license_expression_spdx: GPL-2.0-only OR LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 395
@@ -1016,6 +1097,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0 OR lgpl-2.0-plus
+        spdx_license_expression: GPL-2.0-only OR LGPL-2.0-or-later
         rule_identifier: gpl-2.0_or_lgpl-2.0-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_lgpl-2.0-plus_1.RULE
@@ -1027,6 +1109,7 @@ other_license_detections:
            This version may be optionally licenced under the GNU LGPL licence.
     identifier: gpl_2_0_or_lgpl_2_0_plus-206cbc1f-fed9-7e50-e2a9-4f46f9c7e00b
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '80.0'
         start_line: 430
@@ -1036,12 +1119,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 426
@@ -1051,6 +1136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_86.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_86.RULE
@@ -1059,6 +1145,7 @@ other_license_detections:
            the GNU Lesser (Library) General Public License
     identifier: lgpl_2_0_plus-3e10ba6d-0bbf-e152-fb34-825bba879c49
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 435
@@ -1068,6 +1155,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1064.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1064.RULE
@@ -1076,6 +1164,7 @@ other_license_detections:
            license.
     identifier: mit-e2868c72-df76-6a12-abb5-ab69764643a3
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '80.0'
         start_line: 461
@@ -1085,12 +1174,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 458
@@ -1100,6 +1191,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
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 2d17dbd654f..1ac7e7fb7ee 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 20
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_842.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_842.RULE
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 565c2490d81..a1ec86d48a4 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 24
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -93,6 +95,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
@@ -107,6 +110,7 @@ other_license_detections:
           GNU General Public License for more details.
     identifier: gpl_2_0-13c8cd4f-352a-44e7-e48a-515a025ad21a
   - license_expression: gpl-2.0 AND openssl-exception-gpl-3.0-plus
+    license_expression_spdx: GPL-2.0-only AND cryptsetup-OpenSSL-exception
     matches:
       - score: '100.0'
         start_line: 50
@@ -116,6 +120,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
@@ -136,6 +141,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openssl-exception-gpl-3.0-plus
+        spdx_license_expression: cryptsetup-OpenSSL-exception
         rule_identifier: openssl-exception-gpl-3.0-plus.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openssl-exception-gpl-3.0-plus.LICENSE
@@ -161,6 +167,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -174,6 +181,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_and_openssl_exception_gpl_3_0_plus-4bfc23da-ba7f-0034-0c4a-76df54fb9c6c
   - license_expression: gpl-2.0-plus AND autoconf-simple-exception-2.0 AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND Autoconf-exception-generic AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 155
@@ -183,6 +191,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_3.RULE
@@ -204,6 +213,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
         rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
@@ -220,6 +230,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -233,6 +244,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_autoconf_simple_exception_2_0_and_gpl_2_0-9c440fc6-c89d-eac9-984f-9afc3517a2bc
   - license_expression: gpl-3.0-plus WITH autoconf-simple-exception AND gpl-3.0
+    license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 186
@@ -242,6 +254,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH autoconf-simple-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
         rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-simple-exception_2.RULE
@@ -270,6 +283,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
@@ -283,6 +297,7 @@ other_license_detections:
           version 3 can be found in the file `/usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0_plus_with_autoconf_simple_exception_and_gpl_3_0-e49c9732-fd54-b06b-2294-0f61ae2e1dd0
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0 AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 217
@@ -292,6 +307,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
         rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_2.RULE
@@ -318,6 +334,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -331,6 +348,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_with_libtool_exception_2_0_and_gpl_2_0-48888805-4960-c49a-d793-4fb6f61d046a
   - license_expression: lgpl-2.0-plus WITH libtool-exception-2.0 AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 245
@@ -340,6 +358,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: LGPL-2.0-or-later WITH Libtool-exception
         rule_identifier: lgpl-2.0-plus_with_libtool-exception-2.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_with_libtool-exception-2.0_4.RULE
@@ -366,6 +385,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_452.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_452.RULE
@@ -379,6 +399,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
     identifier: lgpl_2_0_plus_with_libtool_exception_2_0_and_lgpl_2_0_plus-ffe3027e-56b0-cee0-d997-bbd2a4c2f1b9
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 376
@@ -388,6 +409,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -405,6 +427,7 @@ other_license_detections:
           OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 407
@@ -414,6 +437,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -423,6 +447,7 @@ other_license_detections:
           modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-ed3d6762-95f0-131d-94c5-834f10d192a2
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 417
@@ -432,6 +457,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
@@ -440,6 +466,7 @@ other_license_detections:
           gives unlimited permission to copy, distribute and modify it.
     identifier: fsf_free-95bff5c5-ed9b-1c78-0dd8-4c05168176ba
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 446
@@ -449,6 +476,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
@@ -463,6 +491,7 @@ other_license_detections:
           PARTICULAR PURPOSE.
     identifier: fsf_unlimited_no_warranty-0823c9f0-6e4b-8cf0-64e1-5165a09dfa45
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 460
@@ -472,6 +501,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
@@ -482,6 +512,7 @@ other_license_detections:
           without warranty of any kind.
     identifier: fsf_ap-6e2950ec-5e19-6eae-7b74-d4a2741381b9
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 470
@@ -491,6 +522,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
@@ -501,6 +533,7 @@ other_license_detections:
           warranty.
     identifier: fsf_ap-a7d380d0-4462-458a-36c1-1852bdcbf538
   - license_expression: bzip2-libbzip-2010
+    license_expression_spdx: bzip2-1.0.6
     matches:
       - score: '100.0'
         start_line: 482
@@ -510,6 +543,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
         rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
@@ -546,6 +580,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bzip2_libbzip_2010-72b4db44-6142-9aeb-acd2-1d8f2447148c
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '70.0'
         start_line: 518
@@ -555,6 +590,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
@@ -567,12 +603,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public Domain
     identifier: public_domain-3a08f30b-d5be-6da1-ff9f-8c48b649c6c7
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 526
@@ -582,12 +620,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
         matched_text: is public domain
     identifier: public_domain-7d49b7ad-8b9e-60cd-5fde-397e63b65786
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 533
@@ -597,12 +637,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_45.RULE
         rule_relevance: 100
         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
     identifier: public_domain-f03547dd-ab14-17f3-8260-38458dca67ee
   - license_expression: x11-tiff
+    license_expression_spdx: libtiff
     matches:
       - score: '100.0'
         start_line: 543
@@ -612,6 +654,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-tiff
+        spdx_license_expression: libtiff
         rule_identifier: x11-tiff.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-tiff.LICENSE
@@ -636,6 +679,7 @@ other_license_detections:
           OF THIS SOFTWARE.
     identifier: x11_tiff-5ce7e7c5-68de-6124-c361-eb1e45ac5ec7
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 565
@@ -645,6 +689,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
@@ -657,12 +702,15 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain.
     identifier: public_domain-12719e81-b9e7-3b20-5ec2-b0cc7eebb090
   - license_expression: apache-2.0 AND (free-unknown AND apache-2.0 WITH generic-exception)
+    license_expression_spdx: Apache-2.0 AND (LicenseRef-scancode-free-unknown AND Apache-2.0
+      WITH LicenseRef-scancode-generic-exception)
     matches:
       - score: '100.0'
         start_line: 579
@@ -672,6 +720,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
@@ -695,6 +744,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: free-unknown AND apache-2.0 WITH generic-exception
+        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
         rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
@@ -713,6 +763,7 @@ other_license_detections:
           found in the file `/usr/share/common-licenses/Apache-2.0'.
     identifier: apache_2_0_and__free_unknown_and_apache_2_0_with_generic_exception-4b3213fc-c113-2772-9c82-d6f6f834cb7d
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2 AND gpl-3.0
+    license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 610
@@ -722,6 +773,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
         rule_identifier: gpl-3.0-plus_with_bison-exception-2.2_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-2.2_6.RULE
@@ -753,6 +805,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
@@ -766,6 +819,7 @@ other_license_detections:
           version 3 can be found in the file `/usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0_plus_with_bison_exception_2_2_and_gpl_3_0-89877544-461a-1807-d39e-e7828b16809d
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 638
@@ -775,6 +829,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -787,6 +842,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_90.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_90.RULE
@@ -802,6 +858,7 @@ other_license_detections:
           GNU General Public License for more details.
     identifier: gpl_2_0_plus-fd645ea4-8c55-2e5f-ed83-f732efae58db
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 649
@@ -811,6 +868,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -823,6 +881,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_302.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_302.RULE
@@ -837,6 +896,7 @@ other_license_detections:
           Lesser General Public License for more details.
     identifier: lgpl_2_1-b259c323-2b92-43df-e588-943699e0bf8f
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 668
@@ -846,6 +906,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1063.RULE
@@ -868,6 +929,7 @@ other_license_detections:
           TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-61fd06a2-aa8b-6f8b-d7a6-d21c4378a12a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 686
@@ -877,6 +939,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_28.RULE
@@ -903,6 +966,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-0babbbff-d6dd-6741-97f3-c930c052317f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 708
@@ -912,6 +976,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -941,6 +1006,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 733
@@ -950,6 +1016,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -971,6 +1038,7 @@ other_license_detections:
           3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 34
@@ -980,6 +1048,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -993,6 +1062,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 73
@@ -1002,6 +1072,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -1015,6 +1086,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 121
@@ -1024,6 +1096,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -1037,6 +1110,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 135
@@ -1046,6 +1120,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -1059,6 +1134,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 170
@@ -1068,6 +1144,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -1081,6 +1158,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: gpl-3.0
+    license_expression_spdx: GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 203
@@ -1090,6 +1168,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
@@ -1103,6 +1182,7 @@ other_license_detections:
           version 3 can be found in the file `/usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0-e668b2f1-84da-940b-2a7d-b9bf66e9244b
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 232
@@ -1112,6 +1192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
@@ -1125,6 +1206,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-31fbee1e-1dbb-ab54-755a-9520b4bece5f
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 260
@@ -1134,6 +1216,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_452.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_452.RULE
@@ -1147,6 +1230,7 @@ other_license_detections:
           version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
     identifier: lgpl_2_0_plus-5963c0a6-6f43-d89e-43e3-189423b8461a
   - license_expression: x11-xconsortium AND public-domain
+    license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
       - score: '20.2'
         start_line: 293
@@ -1156,6 +1240,7 @@ other_license_detections:
         match_coverage: '20.2'
         matcher: 3-seq
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_21.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_21.RULE
@@ -1172,12 +1257,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_58.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-d9561273-6993-908f-b782-aed5836bd09b
   - license_expression: free-unknown AND apache-2.0 WITH generic-exception
+    license_expression_spdx: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
     matches:
       - score: '100.0'
         start_line: 591
@@ -1187,6 +1274,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: free-unknown AND apache-2.0 WITH generic-exception
+        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
         rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
@@ -1205,6 +1293,7 @@ other_license_detections:
           found in the file `/usr/share/common-licenses/Apache-2.0'.
     identifier: free_unknown_and_apache_2_0_with_generic_exception-f6e83f64-9eb6-7bd3-40a7-d2f9f8c12904
   - license_expression: gpl-3.0
+    license_expression_spdx: GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 630
@@ -1214,6 +1303,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
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 c3a996218f0..887b8f562c6 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
@@ -7,6 +7,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 24
@@ -16,6 +17,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -28,6 +30,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
@@ -42,6 +45,7 @@ other_license_detections:
           GNU General Public License for more details.
     identifier: gpl_2_0-13c8cd4f-352a-44e7-e48a-515a025ad21a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 34
@@ -51,6 +55,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
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 a58e804efbc..382bb00bfc0 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
@@ -40,6 +40,7 @@ other_license_expression_spdx: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exceptio
 license_detections: []
 other_license_detections:
   - license_expression: gary-s-brown
+    license_expression_spdx: LicenseRef-scancode-gary-s-brown
     matches:
       - score: '100.0'
         start_line: 81
@@ -49,6 +50,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gary-s-brown
+        spdx_license_expression: LicenseRef-scancode-gary-s-brown
         rule_identifier: gary-s-brown.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gary-s-brown.LICENSE
@@ -57,6 +59,7 @@ other_license_detections:
           desired without restriction.
     identifier: gary_s_brown-00cc5fb9-1775-705c-7cef-d16939c33621
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 84
@@ -66,6 +69,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -78,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_807.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_807.RULE
@@ -100,6 +105,7 @@ other_license_detections:
           License v2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-4e79540c-e313-dd16-f163-61e6669029cb
   - license_expression: gpl-2.0-plus WITH openssl-exception-gpl-3.0-plus
+    license_expression_spdx: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception
     matches:
       - score: '100.0'
         start_line: 103
@@ -109,6 +115,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: gpl-2.0-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
@@ -143,6 +150,7 @@ other_license_detections:
           then also delete it here.
     identifier: gpl_2_0_plus_with_openssl_exception_gpl_3_0_plus-cd0a53c3-195e-8aaa-a52a-63cdd0ec060b
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 132
@@ -152,6 +160,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -164,6 +173,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_293.RULE
@@ -187,6 +197,7 @@ other_license_detections:
           License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-92524a9d-fa24-4473-c0bd-9db8994678c0
   - license_expression: lgpl-2.1-plus WITH openssl-exception-gpl-3.0-plus
+    license_expression_spdx: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception
     matches:
       - score: '95.0'
         start_line: 152
@@ -196,6 +207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: lgpl-2.1-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
@@ -231,6 +243,7 @@ other_license_detections:
           program, then also delete it here.
     identifier: lgpl_2_1_plus_with_openssl_exception_gpl_3_0_plus-e204903f-6e59-75fe-0a89-535375db6e93
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 183
@@ -240,6 +253,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_129.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_129.RULE
@@ -251,6 +265,7 @@ other_license_detections:
           Universal license can be found in `/usr/share/common-licenses/CC0-1.0'.
     identifier: cc0_1_0-5beade1d-aaaa-0e66-b349-bf4292c3ebff
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 189
@@ -260,6 +275,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -272,6 +288,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_845.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_845.RULE
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 812f1337293..0ce3413caa6 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
@@ -14,6 +14,7 @@ other_license_expression_spdx: LicenseRef-scancode-cups AND LicenseRef-scancode-
 license_detections: []
 other_license_detections:
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 26
@@ -23,6 +24,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_70.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_70.RULE
@@ -52,6 +54,7 @@ other_license_detections:
           OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-ec301da4-ee99-7256-688b-0e0ca57ab6eb
   - license_expression: cups
+    license_expression_spdx: LicenseRef-scancode-cups
     matches:
       - score: '100.0'
         start_line: 51
@@ -61,6 +64,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cups
+        spdx_license_expression: LicenseRef-scancode-cups
         rule_identifier: cups_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cups_6.RULE
@@ -124,6 +128,7 @@ other_license_detections:
           derived work.
     identifier: cups-6d04e430-ddd5-a021-eef2-53103e172a4a
   - license_expression: cups
+    license_expression_spdx: LicenseRef-scancode-cups
     matches:
       - score: '100.0'
         start_line: 110
@@ -133,6 +138,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cups
+        spdx_license_expression: LicenseRef-scancode-cups
         rule_identifier: cups_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cups_4.RULE
@@ -196,6 +202,7 @@ other_license_detections:
           derived work.
     identifier: cups-a1c6fe77-1eeb-f76a-7b3e-a0867d417450
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 169
@@ -205,6 +212,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_7.RULE
@@ -217,6 +225,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
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 33f5fa50772..f84389fd04b 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
@@ -8,6 +8,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (AFL-
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -17,6 +18,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -29,6 +31,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_754.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_754.RULE
@@ -41,6 +44,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus-8b07b509-5e22-a4f6-31f8-ca7a10f27b4b
   - license_expression: afl-2.1
+    license_expression_spdx: AFL-2.1
     matches:
       - score: '100.0'
         start_line: 21
@@ -50,6 +54,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: afl-2.1
+        spdx_license_expression: AFL-2.1
         rule_identifier: afl-2.1_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afl-2.1_12.RULE
@@ -62,6 +67,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: afl-2.1
+        spdx_license_expression: AFL-2.1
         rule_identifier: afl-2.1_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afl-2.1_6.RULE
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 f6e3e732fa0..0b76e55af86 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
@@ -159,6 +159,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 355
@@ -168,6 +169,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
@@ -180,6 +182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_13.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_13.RULE
@@ -191,6 +194,7 @@ other_license_detections:
           found in `/usr/share/common-licenses/Artistic'.
     identifier: artistic_perl_1_0-e9ef718c-d03b-c86e-d9fc-fda61d7cdf41
   - license_expression: artistic-2.0
+    license_expression_spdx: Artistic-2.0
     matches:
       - score: '99.93'
         start_line: 363
@@ -200,6 +204,7 @@ other_license_detections:
         match_coverage: '99.93'
         matcher: 3-seq
         license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
         rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
@@ -395,6 +400,7 @@ other_license_detections:
                IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: artistic_2_0-da505167-7963-b6e8-5f04-2ffe855ea5e9
   - license_expression: gpl-1.0-plus AND gpl-1.0
+    license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
       - score: '100.0'
         start_line: 553
@@ -404,6 +410,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE
@@ -416,6 +423,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_2.RULE
@@ -432,6 +440,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_33.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE
@@ -446,6 +455,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_424.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_424.RULE
@@ -458,12 +468,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
         rule_identifier: gpl-1.0_15.RULE
         rule_relevance: 60
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_15.RULE
         matched_text: GPL-1'
     identifier: gpl_1_0_plus_and_gpl_1_0-40cd1f34-7ef5-dd7b-2ab9-7f0a899d139c
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 562
@@ -473,6 +485,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -485,6 +498,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_396.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_396.RULE
@@ -500,6 +514,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1295.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1295.RULE
@@ -508,6 +523,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-2'
     identifier: gpl_2_0-558b8bf3-eeb8-2a7a-6f28-55f4c2aa111f
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 570
@@ -517,6 +533,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -529,6 +546,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
@@ -545,6 +563,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1295.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1295.RULE
@@ -553,6 +572,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-2'
     identifier: gpl_2_0_plus_and_gpl_2_0-b73d5e9f-2938-57e1-de18-818469af1109
   - license_expression: gpl-3.0 AND gpl-1.0-plus
+    license_expression_spdx: GPL-3.0-only AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 579
@@ -562,6 +582,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE
@@ -574,6 +595,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl_91.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_91.RULE
@@ -589,6 +611,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_237.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_237.RULE
@@ -603,12 +626,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
         matched_text: usr/share/common-licenses/GPL-3'
     identifier: gpl_3_0_and_gpl_1_0_plus-9c11f207-d3a8-a6a3-d2a6-46552a959726
   - license_expression: gpl-3.0-plus AND gpl-3.0
+    license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 587
@@ -618,6 +643,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -630,6 +656,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_284.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_284.RULE
@@ -646,6 +673,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_237.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_237.RULE
@@ -660,12 +688,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
         matched_text: usr/share/common-licenses/GPL-3'
     identifier: gpl_3_0_plus_and_gpl_3_0-3e5fdf20-1437-7ca2-c0cd-475f7307fbbb
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 597
@@ -675,6 +705,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
@@ -692,6 +723,7 @@ other_license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-58175475-cc81-cb6a-8921-4daa3f26b3e8
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 610
@@ -701,6 +733,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_16.RULE
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 7b0ab00bfb9..ed9d67729bb 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
@@ -19,6 +19,7 @@ other_license_expression_spdx: BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AN
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '90.0'
         start_line: 47
@@ -28,6 +29,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1036.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1036.RULE
@@ -47,6 +49,7 @@ other_license_detections:
               from this software without specific, prior written permission.
     identifier: bsd_new-075516ae-8349-5cd8-e103-e7e7fee3a471
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 62
@@ -56,6 +59,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -73,6 +77,7 @@ other_license_detections:
            OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 75
@@ -82,6 +87,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
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 15085390266..a0a4f53dee8 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
@@ -45,6 +45,7 @@ other_license_expression_spdx: (LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-2.1
 license_detections: []
 other_license_detections:
   - license_expression: beerware
+    license_expression_spdx: Beerware
     matches:
       - score: '100.0'
         start_line: 32
@@ -54,6 +55,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: beerware
+        spdx_license_expression: Beerware
         rule_identifier: beerware_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/beerware_1.RULE
@@ -64,6 +66,7 @@ other_license_detections:
           this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
     identifier: beerware-efdd2cec-6f7c-7fe1-5157-6baa71f63497
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 46
@@ -73,6 +76,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_45.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE
@@ -81,6 +85,7 @@ other_license_detections:
           public domain.
     identifier: public_domain-f03547dd-ab14-17f3-8260-38458dca67ee
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 121
@@ -90,6 +95,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -113,6 +119,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 139
@@ -122,6 +129,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -134,6 +142,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_239.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_239.RULE
@@ -159,6 +168,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_83_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_83_1.RULE
@@ -171,12 +181,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_82.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_82.RULE
         matched_text: usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-590ac42f-f1ba-031e-45bf-938f9dd5041a
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 157
@@ -186,6 +198,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -198,6 +211,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_951.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_951.RULE
@@ -218,6 +232,7 @@ other_license_detections:
           found at /usr/share/common-licenses/Apache-2.0.
     identifier: apache_2_0-53bae3a1-895b-b5e0-ddd9-bd842e305a3c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 176
@@ -227,6 +242,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -256,6 +272,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 201
@@ -265,6 +282,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
@@ -291,6 +309,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-25075703-83ad-f419-e8fc-55c5ce7e67a5
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 222
@@ -300,6 +319,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -312,6 +332,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_420.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE
@@ -337,6 +358,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_660.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_660.RULE
@@ -349,12 +371,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_621.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_621.RULE
         matched_text: usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus_and_gpl_2_0-b1883257-dfa5-afb6-71d5-85fe839662ba
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 241
@@ -364,6 +388,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_35.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_35.RULE
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 2b1738e7300..eb62cc3e07a 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
@@ -26,6 +26,7 @@ other_license_expression_spdx: BSD-3-Clause AND (GPL-2.0-only AND GPL-2.0-only)
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 66
@@ -35,6 +36,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -47,6 +49,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
@@ -55,6 +58,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0-416557e2-c2f7-99b4-8ab7-8a3ea02df364
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 71
@@ -64,6 +68,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_1040.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1040.RULE
@@ -77,6 +82,7 @@ other_license_detections:
           License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-dd877c58-59e3-3806-1e07-d20a246adf43
   - license_expression: gpl-3.0
+    license_expression_spdx: GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 79
@@ -86,6 +92,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE
@@ -98,6 +105,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_394.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_394.RULE
@@ -106,6 +114,7 @@ other_license_detections:
           Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
     identifier: gpl_3_0-2db1569e-9bb3-297f-fa07-cccfb39c4a09
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 83
@@ -115,6 +124,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -127,6 +137,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_307.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_307.RULE
@@ -135,6 +146,7 @@ other_license_detections:
           License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1-e422cbf7-cc72-fc90-ad06-06d6fdec2919
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 88
@@ -144,6 +156,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
@@ -174,6 +187,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-25075703-83ad-f419-e8fc-55c5ce7e67a5
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 114
@@ -183,6 +197,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
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 2783592c4b5..dd8da3c19f6 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
+    license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
       - score: '99.02'
         start_line: 17
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '99.02'
         matcher: 3-seq
         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
         rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
@@ -30,6 +32,7 @@ license_detections:
           \  The\ncomplete text of the GNU Library General Public License can be found\nin '/usr/share/common-licenses/LGPL-2'."
     identifier: gpl_2_0_and_lgpl_2_0_and_bsd_new_and_mit_old_style_no_advert-aed55561-0504-0265-5986-832cc7f7bbf2
   - license_expression: ntp-0 AND bsd-new
+    license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 38
@@ -39,6 +42,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ntp-0
+        spdx_license_expression: NTP-0
         rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
@@ -59,6 +63,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 9902c72cb39..e7646233a17 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1137.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1137.RULE
@@ -22,6 +24,7 @@ license_detections:
           General Public License.
     identifier: gpl_2_0-aefa39b0-a76b-6c60-5a18-f680bc579b0d
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 24
@@ -31,6 +34,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_563.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_563.RULE
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 9902c72cb39..e7646233a17 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1137.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1137.RULE
@@ -22,6 +24,7 @@ license_detections:
           General Public License.
     identifier: gpl_2_0-aefa39b0-a76b-6c60-5a18-f680bc579b0d
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 24
@@ -31,6 +34,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_563.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_563.RULE
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 64a07afea06..f385b9ccb0c 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.0
+    license_expression_spdx: LGPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
         rule_identifier: lgpl-2.0_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_24.RULE
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 b9e5dad7fae..5f68ea38e23 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 14
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
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 652a6d27422..9b432b2a096 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
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 84f89b638fc..1ef333821f2 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 14
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 84f89b638fc..1ef333821f2 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 14
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 986987c4426..9e43055a0a3 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 13d473614bb..36323758442 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
@@ -18,6 +18,7 @@ other_license_expression_spdx: (MPL-2.0 AND MPL-2.0) AND (MPL-2.0 AND MPL-2.0) A
 license_detections: []
 other_license_detections:
   - license_expression: mpl-2.0
+    license_expression_spdx: MPL-2.0
     matches:
       - score: '100.0'
         start_line: 38
@@ -27,6 +28,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mpl-2.0
+        spdx_license_expression: MPL-2.0
         rule_identifier: mpl-2.0_75.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_75.RULE
@@ -39,6 +41,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mpl-2.0
+        spdx_license_expression: MPL-2.0
         rule_identifier: mpl-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mpl-2.0.LICENSE
@@ -418,6 +421,7 @@ other_license_detections:
            defined by the Mozilla Public License, v. 2.0.
     identifier: mpl_2_0-a4e80716-0ace-81d4-b4b0-3d29c3a0f1e2
   - license_expression: bsd-2-clause-views
+    license_expression_spdx: BSD-2-Clause-Views
     matches:
       - score: '100.0'
         start_line: 414
@@ -427,6 +431,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-2-clause-views
+        spdx_license_expression: BSD-2-Clause-Views
         rule_identifier: bsd-2-clause-views_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-2-clause-views_1.RULE
@@ -461,6 +466,7 @@ other_license_detections:
           Foundation.
     identifier: bsd_2_clause_views-1d997716-afbf-cd29-cb1e-420af00fe852
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.04'
         start_line: 446
@@ -470,6 +476,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_784.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_784.RULE
@@ -501,6 +508,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-2b3a5518-e8a8-d9b2-be49-79747be815eb
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 472
@@ -510,6 +518,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -522,6 +531,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_99.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_99.RULE
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 6539f136869..e59da558721 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
@@ -34,6 +34,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND (CC0-
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 93
@@ -43,6 +44,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -55,6 +57,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_949.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_949.RULE
@@ -75,6 +78,7 @@ other_license_detections:
           found in /usr/share/common-licenses/Apache-2.0
     identifier: apache_2_0-48f1cb7d-5851-8285-69a3-25dbd96819f7
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 109
@@ -84,6 +88,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -96,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
@@ -117,6 +123,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-cc17af11-ba60-7b3d-40d0-91bc262b80f8
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 126
@@ -126,6 +133,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -138,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_385.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_385.RULE
@@ -159,6 +168,7 @@ other_license_detections:
           Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
     identifier: gpl_3_0_plus-d32e0b16-ec08-400f-7308-94bab4d18d11
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 143
@@ -168,6 +178,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -180,6 +191,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_457.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_457.RULE
@@ -198,6 +210,7 @@ other_license_detections:
           License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
     identifier: lgpl_2_0_plus-d3782433-aa9a-99c9-ba7e-875a7ee9c1c7
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 157
@@ -207,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -219,6 +233,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_186.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_186.RULE
@@ -247,6 +262,7 @@ other_license_detections:
           can be found in `/usr/share/common-licenses/CC0-1.0'.
     identifier: cc0_1_0-3aab8d22-5239-2e29-95d3-367a0090d037
   - license_expression: cc-by-sa-3.0
+    license_expression_spdx: CC-BY-SA-3.0
     matches:
       - score: '97.8'
         start_line: 182
@@ -256,6 +272,7 @@ other_license_detections:
         match_coverage: '97.8'
         matcher: 3-seq
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_35.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_35.RULE
@@ -569,6 +586,7 @@ other_license_detections:
           rights under applicable law.
     identifier: cc_by_sa_3_0-e7ec5d5a-0fab-6861-22fd-9f2bbf2329d1
   - license_expression: cc-by-sa-4.0
+    license_expression_spdx: CC-BY-SA-4.0
     matches:
       - score: '100.0'
         start_line: 491
@@ -578,6 +596,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-sa-4.0
+        spdx_license_expression: CC-BY-SA-4.0
         rule_identifier: cc-by-sa-4.0_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_36.RULE
@@ -590,6 +609,7 @@ other_license_detections:
         match_coverage: '99.82'
         matcher: 3-seq
         license_expression: cc-by-sa-4.0
+        spdx_license_expression: CC-BY-SA-4.0
         rule_identifier: cc-by-sa-4.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/cc-by-sa-4.0.LICENSE
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 6f50abdc11b..2f22181fcb2 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
@@ -9,6 +9,7 @@ other_license_expression_spdx: (Apache-2.0 AND Apache-2.0) AND (Apache-2.0 AND A
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 14
@@ -18,6 +19,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -30,6 +32,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_845.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_845.RULE
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 434eee1d355..b626046bae2 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
@@ -15,6 +15,7 @@ other_license_expression_spdx: Xfig AND (GPL-2.0-or-later AND (GPL-2.0-only OR G
 license_detections: []
 other_license_detections:
   - license_expression: mit-xfig
+    license_expression_spdx: Xfig
     matches:
       - score: '100.0'
         start_line: 28
@@ -24,6 +25,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit-xfig
+        spdx_license_expression: Xfig
         rule_identifier: mit-xfig_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-xfig_3.RULE
@@ -38,6 +40,7 @@ other_license_detections:
           and this permission notice remain intact.
     identifier: mit_xfig-68304201-7efe-7547-fced-118d30e23a28
   - license_expression: gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)
+    license_expression_spdx: GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)
     matches:
       - score: '100.0'
         start_line: 53
@@ -47,6 +50,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -59,6 +63,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0 OR gpl-3.0
+        spdx_license_expression: GPL-2.0-only OR GPL-3.0-only
         rule_identifier: gpl-2.0_or_gpl-3.0_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_gpl-3.0_19.RULE
@@ -81,6 +86,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-8218f179-4b24-48cf-64bb-43e3681ddaa0
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 75
@@ -90,6 +96,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
@@ -105,6 +112,7 @@ other_license_detections:
           without express or implied warranty.
     identifier: mit_old_style_no_advert-469a8f5b-14cb-1cf1-ac4f-fd7a23bb63e5
   - license_expression: gpl-3.0 AND gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-only AND GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 88
@@ -114,6 +122,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE
@@ -126,6 +135,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_96.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_96.RULE
@@ -147,6 +157,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_405.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_405.RULE
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 d5c4247e0b4..c346eec7aa6 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
@@ -30,6 +30,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND CC-BY-SA-3.0
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 69
@@ -39,6 +40,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -51,6 +53,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1149.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1149.RULE
@@ -71,6 +74,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0-b917de81-5bba-1d0f-2db7-5318a537b85c
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 85
@@ -80,6 +84,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -92,6 +97,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -113,6 +119,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_215.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_215.RULE
@@ -125,12 +132,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_82.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_82.RULE
         matched_text: usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus_and_lgpl_2_1-2059e657-b017-b289-bd23-348b4f78bc71
   - license_expression: boost-1.0
+    license_expression_spdx: BSL-1.0
     matches:
       - score: '100.0'
         start_line: 100
@@ -140,6 +149,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
         rule_identifier: boost-1.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/boost-1.0.LICENSE
@@ -169,6 +179,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: boost_1_0-dcd1a22a-7766-abc4-a96d-eefedae4fbf2
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 125
@@ -178,6 +189,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1073.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1073.RULE
@@ -199,6 +211,7 @@ other_license_detections:
             permission.
     identifier: bsd_new-aff84c79-b8ad-af44-8c02-73d6e6a799a0
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 141
@@ -208,6 +221,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -220,6 +234,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1020.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1020.RULE
@@ -228,6 +243,7 @@ other_license_detections:
           can be found at /usr/share/common-licenses/Apache-2.0.
     identifier: apache_2_0-f9ae1f00-9945-c0a9-e6bb-cebf07aec6f2
   - license_expression: cc-by-sa-3.0
+    license_expression_spdx: CC-BY-SA-3.0
     matches:
       - score: '99.82'
         start_line: 146
@@ -237,6 +253,7 @@ other_license_detections:
         match_coverage: '99.82'
         matcher: 3-seq
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_41.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_41.RULE
@@ -619,6 +636,7 @@ other_license_detections:
           Creative Commons may be contacted at http://creativecommons.org/.
     identifier: cc_by_sa_3_0-33d6e24f-4dca-f73d-ade0-52b78a9bc1e8
   - license_expression: bitstream
+    license_expression_spdx: Bitstream-Vera
     matches:
       - score: '100.0'
         start_line: 524
@@ -628,6 +646,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bitstream
+        spdx_license_expression: Bitstream-Vera
         rule_identifier: bitstream_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bitstream_11.RULE
@@ -683,6 +702,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bitstream
+        spdx_license_expression: Bitstream-Vera
         rule_identifier: bitstream_9.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bitstream_9.RULE
@@ -731,6 +751,7 @@ other_license_detections:
            fr.
     identifier: bitstream-6eb1644f-4007-7683-5ade-46612c3b481f
   - license_expression: cc-by-sa-3.0 AND gpl-2.0
+    license_expression_spdx: CC-BY-SA-3.0 AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: '19'
@@ -740,6 +761,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_85.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_85.RULE
@@ -755,6 +777,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_822.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_822.RULE
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 316a07cc0b6..32f20953af5 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
@@ -17,6 +17,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (LGPL
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 34
@@ -26,6 +27,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -38,6 +40,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_655.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_655.RULE
@@ -55,6 +58,7 @@ other_license_detections:
           the file /usr/share/common-licenses/GPL-2
     identifier: gpl_2_0_plus-54c2522e-ad9a-3fb1-7ef4-964ecea834d4
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 47
@@ -64,6 +68,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -76,6 +81,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_202.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_202.RULE
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 f985adad9b1..b48ae5e4968 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
@@ -71,6 +71,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1523
@@ -80,6 +81,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -92,6 +94,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_1038.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE
@@ -114,6 +117,7 @@ license_detections:
           Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-841292a1-755d-28a2-e988-9335e1ab78af
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1541
@@ -123,6 +127,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -135,6 +140,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_512.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE
@@ -157,6 +163,7 @@ license_detections:
           Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-dd3fa3fa-0f02-d622-9751-b34998421a05
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 1559
@@ -166,6 +173,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -178,6 +186,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_418.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE
@@ -202,6 +211,7 @@ license_detections:
           `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-f25c3ccd-f8e8-1ec3-cce3-8fe504f23993
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 1580
@@ -211,6 +221,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -234,6 +245,7 @@ license_detections:
           SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1599
@@ -243,6 +255,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_577.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE
@@ -272,6 +285,7 @@ license_detections:
           OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-5be47247-8ec7-7f95-1b90-0aaa3275e0c2
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 1624
@@ -281,6 +295,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_71.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE
@@ -313,6 +328,7 @@ license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_original-351c901f-5810-bf40-e98b-65d5c070c643
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1651
@@ -322,6 +338,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -334,6 +351,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE
@@ -352,6 +370,7 @@ license_detections:
           Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'.
     identifier: lgpl_3_0_plus-1efe4ad9-3fe0-d0d3-abd8-c522d921e751
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 1666
@@ -361,6 +380,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_325.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE
@@ -371,6 +391,7 @@ license_detections:
           made (if any).
     identifier: other_permissive-f5dd09cb-3a00-86dd-63d7-a576f4dd0415
   - license_expression: free-unknown
+    license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
       - score: '100.0'
         start_line: 413
@@ -380,12 +401,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
         rule_identifier: free-unknown-package_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE
         matched_text: This file is distributed under the same license as the PACKAGE package.
     identifier: free_unknown-6489a264-9d51-ad5f-94b9-6939d54b4036
   - license_expression: free-unknown
+    license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
       - score: '91.67'
         start_line: 562
@@ -395,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
         rule_identifier: free-unknown-package_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE
@@ -402,6 +426,7 @@ license_detections:
           package.
     identifier: free_unknown-bdda6baa-90ff-18b3-96c9-89a930a6cf8d
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1099
@@ -411,6 +436,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_67.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE
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 1754e600e8c..2366d751545 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
@@ -89,6 +89,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: agpl-3.0 WITH ps-or-pdf-font-exception-20170817
+    license_expression_spdx: AGPL-3.0-only WITH PS-or-PDF-font-exception-20170817
     matches:
       - score: '100.0'
         start_line: 173
@@ -98,6 +99,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: agpl-3.0_with_ps-or-pdf-font-exception-20170817_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_with_ps-or-pdf-font-exception-20170817_4.RULE
@@ -110,6 +112,7 @@ license_detections:
           applying to the document itself.
     identifier: agpl_3_0_with_ps_or_pdf_font_exception_20170817-ed1e1d48-5cd6-fc20-cff3-d572cc902a51
   - license_expression: sunsoft
+    license_expression_spdx: LicenseRef-scancode-sunsoft
     matches:
       - score: '95.0'
         start_line: 294
@@ -119,6 +122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: sunsoft
+        spdx_license_expression: LicenseRef-scancode-sunsoft
         rule_identifier: sunsoft_3.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sunsoft_3.RULE
@@ -130,6 +134,7 @@ license_detections:
           without written authorization from SunSoft Inc.
     identifier: sunsoft-9e170ca7-5eab-6023-c890-1ba3851e8a55
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 309
@@ -139,6 +144,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_383.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_383.RULE
@@ -150,6 +156,7 @@ license_detections:
           it is in the public domain.
     identifier: public_domain-a8f3e8b6-d79b-1fc8-30fd-9518354ad221
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 448
@@ -159,6 +166,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_358.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_358.RULE
@@ -169,6 +177,7 @@ license_detections:
           and copyright notices are not removed.
     identifier: other_permissive-a020883d-5da3-dfe5-3a09-0e477097d983
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 497
@@ -178,12 +187,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl_72.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
         matched_text: 'License: gpl'
     identifier: gpl_1_0_plus-0f8d8911-0b73-cb68-4903-af37c6fa7204
   - license_expression: agpl-3.0
+    license_expression_spdx: AGPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 501
@@ -193,6 +204,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
         rule_identifier: agpl-3.0.SPDX.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0.SPDX.RULE
@@ -1049,6 +1061,7 @@ license_detections:
           see .
     identifier: agpl_3_0-0bed8dea-334f-6bb4-5c12-6df57a2f51e9
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 1371
@@ -1058,6 +1071,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
@@ -1067,6 +1081,7 @@ license_detections:
           to copy, distribute and modify it.
     identifier: fsf_free-95bff5c5-ed9b-1c78-0dd8-4c05168176ba
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 1376
@@ -1076,6 +1091,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1105,6 +1121,7 @@ license_detections:
           OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 1401
@@ -1114,6 +1131,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1062.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1062.RULE
@@ -1143,6 +1161,7 @@ license_detections:
           OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-2b241477-a3d9-e41f-880b-5c807b093521
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 1426
@@ -1152,6 +1171,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_ghostgum.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_ghostgum.RULE
@@ -1175,6 +1195,7 @@ license_detections:
           in all copies or substantial portions of the Software.
     identifier: other_permissive-fd855fe2-d5ca-1ed7-01f5-b2c174d38d41
   - license_expression: x11-opengroup
+    license_expression_spdx: MIT-open-group
     matches:
       - score: '99.0'
         start_line: 1445
@@ -1184,6 +1205,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-opengroup
+        spdx_license_expression: MIT-open-group
         rule_identifier: x11-opengroup_7.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-opengroup_7.RULE
@@ -1210,6 +1232,7 @@ license_detections:
           OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: x11_opengroup-c0baba15-36ec-f739-435b-4ef2c266d8e6
   - license_expression: ghostpdl-permissive
+    license_expression_spdx: LicenseRef-scancode-ghostpdl-permissive
     matches:
       - score: '100.0'
         start_line: 1467
@@ -1219,6 +1242,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: ghostpdl-permissive
+        spdx_license_expression: LicenseRef-scancode-ghostpdl-permissive
         rule_identifier: ghostpdl-permissive.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ghostpdl-permissive.LICENSE
@@ -1230,6 +1254,7 @@ license_detections:
           without express or implied warranty.
     identifier: ghostpdl_permissive-2177824a-095c-adda-efec-b4b3889ae253
   - license_expression: x11-lucent-variant
+    license_expression_spdx: LicenseRef-scancode-x11-lucent-variant
     matches:
       - score: '100.0'
         start_line: 1474
@@ -1239,6 +1264,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-lucent-variant
+        spdx_license_expression: LicenseRef-scancode-x11-lucent-variant
         rule_identifier: x11-lucent-variant.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-lucent-variant.LICENSE
@@ -1257,6 +1283,7 @@ license_detections:
           FOR ANY PARTICULAR PURPOSE.
     identifier: x11_lucent_variant-0e88e176-7371-c813-4b40-735c84e7f166
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1488
@@ -1266,6 +1293,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -1304,6 +1332,7 @@ license_detections:
           EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1522
@@ -1313,6 +1342,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_686.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_686.RULE
@@ -1356,6 +1386,7 @@ license_detections:
           EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-a5e44982-9f3e-5ae9-551e-f8d64cb0c9a4
   - license_expression: freetype
+    license_expression_spdx: FTL
     matches:
       - score: '100.0'
         start_line: 1561
@@ -1365,6 +1396,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: freetype
+        spdx_license_expression: FTL
         rule_identifier: freetype_13.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freetype_13.RULE
@@ -1551,6 +1583,7 @@ license_detections:
           Our home page can be found at https://www.freetype.org
     identifier: freetype-157faafb-23f1-d344-a6d4-4d5e38b264e1
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 1743
@@ -1560,6 +1593,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -1586,6 +1620,7 @@ license_detections:
               from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 1765
@@ -1595,6 +1630,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -1616,6 +1652,7 @@ license_detections:
           THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: agpl-3.0 AND agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 73
@@ -1625,6 +1662,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
         rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
@@ -1637,12 +1675,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 68
@@ -1652,6 +1692,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_247.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_247.RULE
@@ -1663,6 +1704,7 @@ license_detections:
            either version 3 of the License, or (at your option) any later version.
     identifier: agpl_3_0_plus-9790711c-f852-2e96-76d4-69d13b8d5c92
   - license_expression: agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-or-later
     matches:
       - score: '90.0'
         start_line: 76
@@ -1672,12 +1714,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_143.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_143.RULE
         matched_text: GPL Ghostscript,
     identifier: agpl_3_0_plus-02164878-d830-a722-7cb5-b3f8e9c993e7
   - license_expression: agpl-3.0 AND agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 91
@@ -1687,6 +1731,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
         rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
@@ -1699,12 +1744,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 86
@@ -1714,6 +1761,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_244.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_244.RULE
@@ -1725,6 +1773,7 @@ license_detections:
            either version 3 of the License, or (at your option) any later version.
     identifier: agpl_3_0_plus-216d74e8-63ae-629e-d26a-b8864800db68
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 96
@@ -1734,6 +1783,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_311.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_311.RULE
@@ -1743,6 +1793,7 @@ license_detections:
            Version 2.1 (February 1999).
     identifier: lgpl_2_1-a0030e83-84c9-0111-13c6-499f16bff294
   - license_expression: freetype
+    license_expression_spdx: FTL
     matches:
       - score: '100.0'
         start_line: 121
@@ -1752,6 +1803,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: freetype
+        spdx_license_expression: FTL
         rule_identifier: freetype_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freetype_4.RULE
@@ -1764,6 +1816,7 @@ license_detections:
            and understand and accept it fully.
     identifier: freetype-750b0ed3-8b16-be90-88db-6d5ee749211c
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 135
@@ -1773,6 +1826,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_464.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_464.RULE
@@ -1787,6 +1841,7 @@ license_detections:
            It should be in a file named COPYING.
     identifier: gpl_1_0_plus-75f07376-dadf-88fe-5af5-2593bbb6603e
   - license_expression: ghostscript-1988
+    license_expression_spdx: LicenseRef-scancode-ghostscript-1988
     matches:
       - score: '100.0'
         start_line: 151
@@ -1796,6 +1851,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: ghostscript-1988
+        spdx_license_expression: LicenseRef-scancode-ghostscript-1988
         rule_identifier: ghostscript-1988_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ghostscript-1988_4.RULE
@@ -1810,6 +1866,7 @@ license_detections:
            It should be in a file named COPYING.
     identifier: ghostscript_1988-67d59ae6-361d-f29a-a644-76e5bf6c05dc
   - license_expression: agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 167
@@ -1819,6 +1876,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_244.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_244.RULE
@@ -1830,6 +1888,7 @@ license_detections:
            either version 3 of the License, or (at your option) any later version.
     identifier: agpl_3_0_plus-216d74e8-63ae-629e-d26a-b8864800db68
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 183
@@ -1839,6 +1898,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
@@ -1853,6 +1913,7 @@ license_detections:
            It should be in a file named COPYING.
     identifier: gpl_1_0_plus-5a5c53bb-10ee-3fc2-72ac-7404350a4553
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 201
@@ -1862,6 +1923,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
@@ -1876,6 +1938,7 @@ license_detections:
            It should be in a file named COPYING.
     identifier: gpl_1_0_plus-5a5c53bb-10ee-3fc2-72ac-7404350a4553
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 225
@@ -1885,6 +1948,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_537.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_537.RULE
@@ -1901,6 +1965,7 @@ license_detections:
            the copyright notice and this notice must be preserved on all copies.
     identifier: gpl_1_0_plus-5cebdd5d-ef65-1bc4-1ab5-cfd96530b0e7
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 236
@@ -1910,12 +1975,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_292.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_292.RULE
         matched_text: This code is subject to the GNU General Public License
     identifier: gpl_1_0_plus-ba33abc1-a637-7834-15a3-a0081ce8d62b
   - license_expression: gpl-1.0-plus OR cups
+    license_expression_spdx: GPL-1.0-or-later OR LicenseRef-scancode-cups
     matches:
       - score: '99.0'
         start_line: 243
@@ -1925,6 +1992,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR cups
+        spdx_license_expression: GPL-1.0-or-later OR LicenseRef-scancode-cups
         rule_identifier: gpl-1.0-plus_or_cups_1.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_cups_1.RULE
@@ -1940,6 +2008,7 @@ license_detections:
            is governed by the CUPS license agreement.
     identifier: gpl_1_0_plus_or_cups-0ea03678-cec8-ea5b-c2f8-2d93f14af275
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 262
@@ -1949,6 +2018,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_1037.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1037.RULE
@@ -1959,6 +2029,7 @@ license_detections:
            either version 2 of the GPL, or (at your option) any later version.
     identifier: gpl_2_0_plus-3050483d-8797-ddfd-0e58-c58d226018f5
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 320
@@ -1968,6 +2039,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_924.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_924.RULE
@@ -1984,6 +2056,7 @@ license_detections:
            at 
     identifier: apache_2_0-56fbcb40-d2a9-d37c-e19b-f2b75a3cf79f
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 338
@@ -1993,6 +2066,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_712.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_712.RULE
@@ -2003,6 +2077,7 @@ license_detections:
            except in compliance with the License.
     identifier: apache_2_0-e99ce2b4-baeb-173b-2ae8-7dd715246734
   - license_expression: agpl-3.0 AND agpl-3.0-plus
+    license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 352
@@ -2012,6 +2087,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
         rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
@@ -2024,12 +2100,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
         rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: afpl-9.0
+    license_expression_spdx: LicenseRef-scancode-afpl-9.0
     matches:
       - score: '90.0'
         start_line: 350
@@ -2039,12 +2117,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: afpl-9.0
+        spdx_license_expression: LicenseRef-scancode-afpl-9.0
         rule_identifier: afpl-9.0_9.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afpl-9.0_9.RULE
         matched_text: AFPL Ghostscript,
     identifier: afpl_9_0-abf2c1de-3f64-cc21-be49-583ff4b55f69
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 363
@@ -2054,6 +2134,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
@@ -2065,6 +2146,7 @@ license_detections:
            either version 2, or (at your option) any later version.
     identifier: gpl_2_0_plus-b2201fb7-5a21-89a3-4ab2-5486f22b89aa
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 375
@@ -2074,6 +2156,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -2085,6 +2168,7 @@ license_detections:
            either version 2 of the License, or (at your option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 390
@@ -2094,6 +2178,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -2105,6 +2190,7 @@ license_detections:
            either version 2 of the License, or (at your option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 402
@@ -2114,6 +2200,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -2125,6 +2212,7 @@ license_detections:
            either version 2 of the License, or (at your option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 412
@@ -2134,6 +2222,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -2145,6 +2234,7 @@ license_detections:
            either version 2 of the License, or (at your option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 422
@@ -2154,6 +2244,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
@@ -2165,6 +2256,7 @@ license_detections:
            either version 2 of the License, or (at your option) any later version.
     identifier: gpl_2_0_plus-fae85b38-a7df-a9b9-e042-839c0951b0f2
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 458
@@ -2174,6 +2266,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
@@ -2188,6 +2281,7 @@ license_detections:
            It should be in a file named COPYING.
     identifier: gpl_1_0_plus-5a5c53bb-10ee-3fc2-72ac-7404350a4553
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 488
@@ -2197,6 +2291,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_284.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_284.RULE
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 9534e3e35ea..51b3f71da77 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 45
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_18.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_18.RULE
@@ -38,6 +40,7 @@ license_detections:
           Public License can be found in `/usr/share/common-licenses/LGPL'.
     identifier: lgpl_2_0_plus-c5f2b989-b7ac-a778-8c01-9fcfb9290933
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 66
@@ -47,12 +50,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
     identifier: mit-1f9f2ae8-7020-0a13-7934-461c752929a4
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 74
@@ -62,12 +67,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         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+'
     identifier: gpl_2_0_plus-53a26be2-1f88-01ec-d294-921768a513c9
   - license_expression: apache-2.0 AND mit AND gpl-2.0-plus
+    license_expression_spdx: Apache-2.0 AND MIT AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 80
@@ -77,6 +84,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1214.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1214.RULE
@@ -92,6 +100,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1035.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1035.RULE
@@ -119,6 +128,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -131,6 +141,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -160,6 +171,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -172,6 +184,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_124.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_124.RULE
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 d5de79eee62..067f6a130cb 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
@@ -15,6 +15,7 @@ other_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (GP
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 27
@@ -24,6 +25,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -36,6 +38,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
@@ -57,6 +60,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-cc17af11-ba60-7b3d-40d0-91bc262b80f8
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 44
@@ -66,6 +70,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -78,6 +83,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_416.RULE
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 663ac168a7e..ea97d06a8b4 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
@@ -17,6 +17,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 105
@@ -26,6 +27,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -38,6 +40,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_90.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_90.RULE
@@ -59,6 +62,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1092.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1092.RULE
@@ -67,6 +71,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-67d2f469-481f-0cd9-8ff9-534830b22de1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 120
@@ -76,6 +81,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -99,6 +105,7 @@ other_license_detections:
           THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: lgpl-2.0-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 138
@@ -108,6 +115,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -120,6 +128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_530.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_530.RULE
@@ -141,6 +150,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_385.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_385.RULE
@@ -149,6 +159,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_0_plus_and_lgpl_2_1-b94eb3c2-132e-4a98-3f36-7d5883ed50d0
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 152
@@ -158,6 +169,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -170,6 +182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -191,6 +204,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_385.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_385.RULE
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 87063e959c8..8738b547f2d 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
@@ -38,6 +38,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.05'
         start_line: 85
@@ -47,6 +48,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_594.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_594.RULE
@@ -79,6 +81,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-1529bb96-2d58-f678-a443-d3bbbf37a9ff
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 114
@@ -88,6 +91,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -102,6 +106,7 @@ other_license_detections:
           PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: ietf
+    license_expression_spdx: LicenseRef-scancode-ietf
     matches:
       - score: '90.0'
         start_line: 129
@@ -111,6 +116,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
         rule_identifier: ietf_7.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_7.RULE
@@ -133,6 +139,7 @@ other_license_detections:
           revoked by the Internet Society or its successors or assigns.
     identifier: ietf-020936d7-aad7-a859-aa41-3ef78b39c612
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 147
@@ -142,6 +149,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -154,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_480.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_480.RULE
@@ -176,6 +185,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-59e30787-1a62-c2cf-50f5-e0d50fffcd04
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 165
@@ -185,6 +195,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -197,6 +208,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_191.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_191.RULE
@@ -219,6 +231,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-3'.
     identifier: lgpl_3_0_plus-1cede042-6a19-16e7-f08a-f722296d0745
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 183
@@ -228,6 +241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -240,6 +254,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_307.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_307.RULE
@@ -262,6 +277,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-75b8a956-d72b-ab7f-5921-bec21e7047bb
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 202
@@ -271,6 +287,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
@@ -301,6 +318,7 @@ other_license_detections:
           OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-d710da7a-d455-7e11-d6d1-e58805668aae
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 228
@@ -310,6 +328,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -334,6 +353,7 @@ other_license_detections:
           USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 247
@@ -343,6 +363,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -355,6 +376,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_131.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_131.RULE
@@ -367,6 +389,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/CC0-1.0.
     identifier: cc0_1_0-28709819-142f-86f2-a09a-d8ab5f97a889
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 81
@@ -376,6 +399,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_321.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_321.RULE
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 2429c8ea9df..7e8139f5101 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
@@ -40,6 +40,7 @@ other_license_expression_spdx: (BSD-3-Clause AND LicenseRef-scancode-google-pate
 license_detections: []
 other_license_detections:
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 187
@@ -49,6 +50,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_292.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_292.RULE
@@ -57,6 +59,7 @@ other_license_detections:
           without fee is hereby granted.
     identifier: other_permissive-b68ae66f-78f0-96ce-91ff-6dc9db670978
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 226
@@ -66,6 +69,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
@@ -97,6 +101,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2
   - license_expression: bsd-new AND google-patent-license-golang
+    license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
     matches:
       - score: '100.0'
         start_line: 255
@@ -106,6 +111,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
@@ -143,6 +149,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: google-patent-license-golang
+        spdx_license_expression: LicenseRef-scancode-google-patent-license-golang
         rule_identifier: google-patent-license-golang_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/google-patent-license-golang_1.RULE
@@ -163,6 +170,7 @@ other_license_detections:
           such litigation is filed.
     identifier: bsd_new_and_google_patent_license_golang-6396c13c-c50d-6867-8cdb-3c6fc442fe86
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 296
@@ -172,6 +180,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -184,6 +193,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1019.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1019.RULE
@@ -204,6 +214,7 @@ other_license_detections:
           /usr/share/common-licenses/Apache-2.0.
     identifier: apache_2_0-0aa97ccb-0d15-2093-0be2-57d791140e1a
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 313
@@ -213,6 +224,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -236,6 +248,7 @@ other_license_detections:
           THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 336
@@ -245,6 +258,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -271,6 +285,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: mpeg-ssg
+    license_expression_spdx: MPEG-SSG
     matches:
       - score: '100.0'
         start_line: 358
@@ -280,6 +295,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mpeg-ssg
+        spdx_license_expression: MPEG-SSG
         rule_identifier: mpeg-ssg_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpeg-ssg_1.RULE
@@ -305,6 +321,7 @@ other_license_detections:
           design.
     identifier: mpeg_ssg-edece10f-06f5-dd49-8002-b4f2d5854d89
   - license_expression: cc-by-3.0
+    license_expression_spdx: CC-BY-3.0
     matches:
       - score: '97.85'
         start_line: 379
@@ -314,6 +331,7 @@ other_license_detections:
         match_coverage: '97.85'
         matcher: 3-seq
         license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
         rule_identifier: cc-by-3.0_102.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_102.RULE
@@ -647,6 +665,7 @@ other_license_detections:
                intended to restrict the license of any rights under applicable law.
     identifier: cc_by_3_0-4a3ad702-c278-8efa-96a7-7950ab5504e8
   - license_expression: bsd-2-clause-views
+    license_expression_spdx: BSD-2-Clause-Views
     matches:
       - score: '98.1'
         start_line: 708
@@ -656,6 +675,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-2-clause-views
+        spdx_license_expression: BSD-2-Clause-Views
         rule_identifier: bsd-2-clause-views_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-2-clause-views_11.RULE
@@ -686,6 +706,7 @@ other_license_detections:
           either expressed or implied, of
     identifier: bsd_2_clause_views-2415de48-d7ef-74fd-0e8e-85439a2304f3
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 171
@@ -695,6 +716,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -705,6 +727,7 @@ other_license_detections:
           is preserved.
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: cc-by-3.0
+    license_expression_spdx: CC-BY-3.0
     matches:
       - score: '100.0'
         start_line: 209
@@ -714,6 +737,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
         rule_identifier: cc-by-3.0_111.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_111.RULE
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 98cc55f4673..1f2a89e287f 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
@@ -8,6 +8,7 @@ other_license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 8
@@ -17,6 +18,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -29,6 +31,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_509.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_509.RULE
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 b8595ebe44c..7726d7acd18 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
@@ -22,6 +22,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 91
@@ -31,6 +32,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
@@ -68,6 +70,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-c0323e55-14e5-80bd-7ec7-8dd3477bd032
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 126
@@ -77,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
@@ -114,6 +118,7 @@ other_license_detections:
           authorization of the copyright holder.
     identifier: unicode-20f1fa03-5a85-518c-1468-0bf7d5e02a8b
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 171
@@ -123,6 +128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -146,6 +152,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: '194'
@@ -155,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -167,6 +175,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
@@ -188,6 +197,7 @@ other_license_detections:
           2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-4843804f-917f-9ea7-c10a-097843d59177
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -197,6 +207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -209,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
@@ -233,6 +245,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
@@ -241,6 +254,7 @@ other_license_detections:
           License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-c606c1e3-5c4c-bc4f-8e43-13cab79bd078
   - license_expression: gpl-2.0-plus OR mit
+    license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
       - score: '100.0'
         start_line: 229
@@ -250,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
         rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
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 b8595ebe44c..7726d7acd18 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
@@ -22,6 +22,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 91
@@ -31,6 +32,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
@@ -68,6 +70,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-c0323e55-14e5-80bd-7ec7-8dd3477bd032
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 126
@@ -77,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
@@ -114,6 +118,7 @@ other_license_detections:
           authorization of the copyright holder.
     identifier: unicode-20f1fa03-5a85-518c-1468-0bf7d5e02a8b
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 171
@@ -123,6 +128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -146,6 +152,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: '194'
@@ -155,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -167,6 +175,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
@@ -188,6 +197,7 @@ other_license_detections:
           2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-4843804f-917f-9ea7-c10a-097843d59177
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -197,6 +207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -209,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
@@ -233,6 +245,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
@@ -241,6 +254,7 @@ other_license_detections:
           License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-c606c1e3-5c4c-bc4f-8e43-13cab79bd078
   - license_expression: gpl-2.0-plus OR mit
+    license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
       - score: '100.0'
         start_line: 229
@@ -250,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
         rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
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 b8595ebe44c..7726d7acd18 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
@@ -22,6 +22,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 91
@@ -31,6 +32,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
@@ -68,6 +70,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-c0323e55-14e5-80bd-7ec7-8dd3477bd032
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 126
@@ -77,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
@@ -114,6 +118,7 @@ other_license_detections:
           authorization of the copyright holder.
     identifier: unicode-20f1fa03-5a85-518c-1468-0bf7d5e02a8b
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 171
@@ -123,6 +128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -146,6 +152,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: '194'
@@ -155,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -167,6 +175,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
@@ -188,6 +197,7 @@ other_license_detections:
           2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-4843804f-917f-9ea7-c10a-097843d59177
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -197,6 +207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -209,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
@@ -233,6 +245,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
@@ -241,6 +254,7 @@ other_license_detections:
           License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-c606c1e3-5c4c-bc4f-8e43-13cab79bd078
   - license_expression: gpl-2.0-plus OR mit
+    license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
       - score: '100.0'
         start_line: 229
@@ -250,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
         rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
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 b8595ebe44c..7726d7acd18 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
@@ -22,6 +22,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 91
@@ -31,6 +32,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
@@ -68,6 +70,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-c0323e55-14e5-80bd-7ec7-8dd3477bd032
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 126
@@ -77,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
@@ -114,6 +118,7 @@ other_license_detections:
           authorization of the copyright holder.
     identifier: unicode-20f1fa03-5a85-518c-1468-0bf7d5e02a8b
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 171
@@ -123,6 +128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -146,6 +152,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: '194'
@@ -155,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -167,6 +175,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
@@ -188,6 +197,7 @@ other_license_detections:
           2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-4843804f-917f-9ea7-c10a-097843d59177
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -197,6 +207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -209,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
@@ -233,6 +245,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
@@ -241,6 +254,7 @@ other_license_detections:
           License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-c606c1e3-5c4c-bc4f-8e43-13cab79bd078
   - license_expression: gpl-2.0-plus OR mit
+    license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
       - score: '100.0'
         start_line: 229
@@ -250,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
         rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
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 e712753ed8b..d794b6fcf87 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
@@ -15,6 +15,7 @@ other_license_expression_spdx: Zlib AND Zlib AND (LGPL-2.0-or-later AND LGPL-2.1
 license_detections: []
 other_license_detections:
   - license_expression: unlicense
+    license_expression_spdx: Unlicense
     matches:
       - score: '100.0'
         start_line: 33
@@ -24,6 +25,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: unlicense
+        spdx_license_expression: Unlicense
         rule_identifier: unlicense_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unlicense_6.RULE
@@ -52,6 +54,7 @@ other_license_detections:
           OTHER DEALINGS IN THE SOFTWARE.
     identifier: unlicense-b1acf3b1-c4b1-049c-a0bb-4218e3dce0b3
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 63
@@ -61,6 +64,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -82,6 +86,7 @@ other_license_detections:
           3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 79
@@ -91,6 +96,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -103,6 +109,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_419.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_419.RULE
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 0469276e4c3..d8281304104 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
@@ -10,6 +10,7 @@ other_license_expression_spdx: TCL AND LicenseRef-scancode-pngsuite
 license_detections: []
 other_license_detections:
   - license_expression: tcl
+    license_expression_spdx: TCL
     matches:
       - score: '98.8'
         start_line: 13
@@ -19,6 +20,7 @@ other_license_detections:
         match_coverage: '98.8'
         matcher: 3-seq
         license_expression: tcl
+        spdx_license_expression: TCL
         rule_identifier: tcl_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_3.RULE
@@ -66,6 +68,7 @@ other_license_detections:
           terms specified in this license.
     identifier: tcl-dd56f002-7495-c249-a5da-5ef965c62822
   - license_expression: pngsuite
+    license_expression_spdx: LicenseRef-scancode-pngsuite
     matches:
       - score: '100.0'
         start_line: 56
@@ -75,6 +78,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: pngsuite
+        spdx_license_expression: LicenseRef-scancode-pngsuite
         rule_identifier: pngsuite.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pngsuite.LICENSE
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 816baaea077..c0525892265 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: x11-xconsortium-veillard
+    license_expression_spdx: LicenseRef-scancode-x11-xconsortium-veillard
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium-veillard
+        spdx_license_expression: LicenseRef-scancode-x11-xconsortium-veillard
         rule_identifier: x11-xconsortium-veillard.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE
@@ -40,6 +42,7 @@ license_detections:
           ings in this Software without prior written authorization from him.
     identifier: x11_xconsortium_veillard-b2601908-f03c-335c-5bbd-e72dc065c901
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 43
@@ -49,6 +52,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_4.RULE
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 4d55cae3b97..7bc70b223b6 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
@@ -148,6 +148,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-or-l
 license_detections: []
 other_license_detections:
   - license_expression: other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
       - score: '90.0'
         start_line: 304
@@ -157,6 +158,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
         rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
@@ -165,6 +167,7 @@ other_license_detections:
           of this license document, but changing it is not allowed.
     identifier: other_copyleft-0ac0d4dd-1063-c305-80e8-d67a64a53eaf
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 386
@@ -174,6 +177,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-free2.RULE
@@ -182,6 +186,7 @@ other_license_detections:
           unlimited permission to copy, distribute and modify it.
     identifier: fsf_free-8d4278b0-1a18-46ea-fb34-66b65143a311
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 505
@@ -191,6 +196,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -212,6 +218,7 @@ other_license_detections:
            3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: gpl-2.0-plus WITH bison-exception-2.2
+    license_expression_spdx: GPL-2.0-or-later WITH Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 562
@@ -221,6 +228,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-2.0-or-later WITH Bison-exception-2.2
         rule_identifier: gpl-2.0-plus_with_bison-exception-2.2_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_bison-exception-2.2_1.RULE
@@ -254,6 +262,7 @@ other_license_detections:
           version 2.2 of Bison.
     identifier: gpl_2_0_plus_with_bison_exception_2_2-ceb319fe-ed42-88fc-1732-0b4f76fdc6cc
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+    license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 597
@@ -263,6 +272,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
         rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
@@ -294,6 +304,7 @@ other_license_detections:
           version 2.2 of Bison.
     identifier: gpl_3_0_plus_with_bison_exception_2_2-637d6c30-89c5-8764-b189-8bb20227ccfc
   - license_expression: stlport-4.5
+    license_expression_spdx: LicenseRef-scancode-stlport-4.5
     matches:
       - score: '100.0'
         start_line: 734
@@ -303,6 +314,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: stlport-4.5
+        spdx_license_expression: LicenseRef-scancode-stlport-4.5
         rule_identifier: stlport-4.5.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/stlport-4.5.LICENSE
@@ -317,6 +329,7 @@ other_license_detections:
           modified is included with the above copyright notice.
     identifier: stlport_4_5-990bf173-c1f4-f13d-0d69-00f3f53ea5bc
   - license_expression: x11-xconsortium AND public-domain
+    license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 807
@@ -326,6 +339,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -359,12 +373,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_58.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-85b6bf80-9de9-fe71-fa83-14be44f52a4b
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 850
@@ -374,6 +390,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -386,6 +403,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1329.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1329.RULE
@@ -407,6 +425,7 @@ other_license_detections:
           along with this program.  If not, see .
     identifier: gpl_2_0-93f9e0b0-f602-f26d-bd96-db62133b8e63
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 867
@@ -416,6 +435,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -428,6 +448,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_1036.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1036.RULE
@@ -450,6 +471,7 @@ other_license_detections:
           along with this program.  If not, see .
     identifier: gpl_2_0_plus-380616da-8e9e-f6e0-48a4-2968f6753e13
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 885
@@ -459,6 +481,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -471,6 +494,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_415.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_415.RULE
@@ -494,6 +518,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-2.1`
     identifier: lgpl_2_1_plus-7ab20781-d1ab-808d-5995-827b36a1937b
   - license_expression: lgpl-2.0-plus AND lgpl-2.0
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 904
@@ -503,6 +528,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -515,6 +541,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
         rule_identifier: lgpl-2.0_189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_189.RULE
@@ -539,6 +566,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-2`
     identifier: lgpl_2_0_plus_and_lgpl_2_0-9618c993-f50f-833f-bab4-b076894634e9
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '53.47'
         start_line: 925
@@ -548,6 +576,7 @@ other_license_detections:
         match_coverage: '59.41'
         matcher: 3-seq
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1036.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1036.RULE
@@ -564,6 +593,7 @@ other_license_detections:
              distribution.
     identifier: bsd_new-7c8321ea-5f82-974c-692b-936bcaabf520
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 937
@@ -573,6 +603,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -602,6 +633,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 961
@@ -611,6 +643,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
@@ -623,6 +656,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-perl-1.0.LICENSE
@@ -756,6 +790,7 @@ other_license_detections:
           The End
     identifier: artistic_perl_1_0-93a1d46b-ef61-c65f-f1af-4f804df80e5f
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1091
@@ -765,12 +800,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
         matched_text: is public domain (
     identifier: public_domain-7d49b7ad-8b9e-60cd-5fde-397e63b65786
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1093
@@ -780,6 +817,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -792,6 +830,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_83.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_83.RULE
@@ -813,6 +852,7 @@ other_license_detections:
           Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
     identifier: gpl_3_0_plus-bef32a24-b1d4-4ab7-d330-6b902546acf3
   - license_expression: lgpl-2.0
+    license_expression_spdx: LGPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 1110
@@ -822,6 +862,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
         rule_identifier: lgpl-2.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE
@@ -834,6 +875,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
         rule_identifier: lgpl-2.0_187.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_187.RULE
@@ -854,6 +896,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-2".
     identifier: lgpl_2_0-a4c832e5-a9fd-43b2-8d18-fe78f560e3e8
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 201
@@ -863,6 +906,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1328.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1328.RULE
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 589d66462d7..06d8340270f 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
@@ -38,6 +38,7 @@ other_license_expression_spdx: (LicenseRef-scancode-public-domain AND LicenseRef
 license_detections: []
 other_license_detections:
   - license_expression: public-domain AND us-govt-public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain
     matches:
       - score: '100.0'
         start_line: 92
@@ -47,6 +48,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_128.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_128.RULE
@@ -59,6 +61,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: us-govt-public-domain
+        spdx_license_expression: LicenseRef-scancode-us-govt-public-domain
         rule_identifier: us-govt-public-domain_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/us-govt-public-domain_24.RULE
@@ -84,6 +87,7 @@ other_license_detections:
           Please cite the author in any work or product based on this material.
     identifier: public_domain_and_us_govt_public_domain-895fe8b3-9bbf-2d1f-e72e-0f0fa3e85ebc
   - license_expression: boost-1.0
+    license_expression_spdx: BSL-1.0
     matches:
       - score: '100.0'
         start_line: 115
@@ -93,6 +97,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
         rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
@@ -120,6 +125,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: boost_1_0-0a228323-a725-4239-e66d-7117aa6c54bb
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 138
@@ -129,6 +135,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -152,6 +159,7 @@ other_license_detections:
           IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: mit-with-modification-obligations AND proprietary-license
+    license_expression_spdx: HPND-export-US-modify AND LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 157
@@ -161,6 +169,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
         rule_identifier: mit-with-modification-obligations_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_4.RULE
@@ -189,6 +198,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
@@ -202,6 +212,7 @@ other_license_detections:
           recognition of their trademark status should be given).
     identifier: mit_with_modification_obligations_and_proprietary_license-d8f55aff-c8ea-6055-f1d9-e64dedf37d99
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 188
@@ -211,6 +222,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_359.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_359.RULE
@@ -224,6 +236,7 @@ other_license_detections:
                Champaign, IL  61820
     identifier: public_domain-3ede6353-539f-56a1-dbd0-5b29db1edfc9
   - license_expression: flex-2.5
+    license_expression_spdx: BSD-3-Clause-flex
     matches:
       - score: '100.0'
         start_line: '197'
@@ -233,6 +246,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
         rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
@@ -252,6 +266,7 @@ other_license_detections:
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: flex_2_5-dc2b38a4-d8d9-e49a-8c97-65694300b4be
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -261,6 +276,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -273,6 +289,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_845.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_845.RULE
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 67f24841cca..1f49a028dbc 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: x11-fsf
+    license_expression_spdx: X11-distribute-modifications-variant
     matches:
       - score: '100.0'
         start_line: 23
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
         rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
@@ -44,6 +46,7 @@ license_detections:
           authorization.
     identifier: x11_fsf-5f3d72c2-fa6a-2f7b-b859-17e7567c1724
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 50
@@ -53,6 +56,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -80,6 +84,7 @@ license_detections:
           tium.
     identifier: x11_xconsortium-8bc3e205-5f29-ecad-90bc-2f492c65be46
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 76
@@ -89,6 +94,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -118,6 +124,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 105
@@ -127,6 +134,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_41.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE
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 b8041c065bf..f68e0dc61a4 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
@@ -17,6 +17,7 @@ other_license_expression_spdx: MIT AND MIT AND BSL-1.0 AND (GPL-2.0-or-later AND
 license_detections: []
 other_license_detections:
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 30
@@ -26,6 +27,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -49,6 +51,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: boost-1.0
+    license_expression_spdx: BSL-1.0
     matches:
       - score: '100.0'
         start_line: 49
@@ -58,6 +61,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
         rule_identifier: boost-1.0_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_24.RULE
@@ -86,6 +90,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: boost_1_0-a8ac3b7f-e1b3-e54d-c81b-d2165ef4621a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 72
@@ -95,6 +100,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -107,6 +113,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
@@ -119,6 +126,7 @@ other_license_detections:
           Public License can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-8f03a209-723a-5338-eac8-e37c880f528d
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 80
@@ -128,6 +136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -140,6 +149,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_985.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_985.RULE
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 a54cf257f9f..1c19f4cd1ba 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
@@ -42,6 +42,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0 AND lgpl-2.1
+    license_expression_spdx: Apache-2.0 AND LGPL-2.1-only
     matches:
       - score: '90.0'
         start_line: 162
@@ -51,6 +52,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0 AND lgpl-2.1
+        spdx_license_expression: Apache-2.0 AND LGPL-2.1-only
         rule_identifier: apache-2.0_and_lgpl-2.1_2.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_lgpl-2.1_2.RULE
@@ -71,6 +73,7 @@ other_license_detections:
           /usr/share/common-licenses/Apache-2.0
     identifier: apache_2_0_and_lgpl_2_1-bf9c1a6e-3503-291d-0a38-d275e48b6404
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 178
@@ -80,6 +83,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_942.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_942.RULE
@@ -108,6 +112,7 @@ other_license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ec493980-5bb3-5f10-73b9-7c82003a5f4b
   - license_expression: boost-1.0
+    license_expression_spdx: BSL-1.0
     matches:
       - score: '100.0'
         start_line: 202
@@ -117,6 +122,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
         rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
@@ -144,6 +150,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: boost_1_0-0a228323-a725-4239-e66d-7117aa6c54bb
   - license_expression: cc-by-3.0
+    license_expression_spdx: CC-BY-3.0
     matches:
       - score: '100.0'
         start_line: 225
@@ -153,6 +160,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
         rule_identifier: cc-by-3.0_110.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_110.RULE
@@ -182,6 +190,7 @@ other_license_detections:
           CONDITIONS.
     identifier: cc_by_3_0-85c40002-c78a-e362-e471-c4d97777bac4
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 250
@@ -191,6 +200,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_26.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE
@@ -203,6 +213,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -226,6 +237,7 @@ other_license_detections:
           SOFTWARE.
     identifier: mit-86fcf017-3572-9813-b7e8-0a10ec4a120f
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 270
@@ -235,6 +247,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -247,6 +260,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_420.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE
@@ -272,6 +286,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_843.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_843.RULE
@@ -280,6 +295,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL-2
     identifier: gpl_2_0_plus-35e4cd88-b99c-c282-9c8d-6adda8e30de7
   - license_expression: gpl-3.0
+    license_expression_spdx: GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 288
@@ -289,6 +305,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE
@@ -301,6 +318,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_417.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_417.RULE
@@ -322,6 +340,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL-3
     identifier: gpl_3_0-8aedd1ed-14a5-6251-d7c9-2043652e8a9d
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 305
@@ -331,6 +350,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -343,6 +363,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_313.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_313.RULE
@@ -358,6 +379,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL-2.1
     identifier: lgpl_2_1-2e3849b9-b454-6df2-7ee6-17217037ee49
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 316
@@ -367,6 +389,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -379,6 +402,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_312.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_312.RULE
@@ -401,6 +425,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL-2.1
     identifier: lgpl_2_1_plus_and_lgpl_2_1-cf318f99-012d-ea29-3c3d-7de3bd7e0338
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 335
@@ -410,6 +435,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_47.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_47.RULE
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 32b70aba701..5d4d11ac186 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
@@ -36,6 +36,7 @@ other_license_expression_spdx: BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AN
 license_detections: []
 other_license_detections:
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 110
@@ -45,6 +46,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
@@ -72,6 +74,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-fe5ce6eb-1b7c-6cd1-2e78-e9f71b0262f1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 135
@@ -81,6 +84,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -110,6 +114,7 @@ other_license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 160
@@ -119,6 +124,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -148,6 +154,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 185
@@ -157,6 +164,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 148263664c7..6ff72ce84ae 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
@@ -16,6 +16,7 @@ other_license_expression_spdx: MIT AND MIT AND BSD-3-Clause AND LicenseRef-scanc
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.53'
         start_line: 26
@@ -25,6 +26,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_314.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_314.RULE
@@ -51,6 +53,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-f23dc916-0d10-a62b-e883-6fe84fea0844
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 48
@@ -60,6 +63,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -86,6 +90,7 @@ other_license_detections:
           OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 71
@@ -95,6 +100,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -107,6 +113,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
@@ -128,6 +135,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-00217b75-1a81-9ffa-8aed-0d1bd2f9756b
   - license_expression: warranty-disclaimer
+    license_expression_spdx: LicenseRef-scancode-warranty-disclaimer
     matches:
       - score: '100.0'
         start_line: 89
@@ -137,6 +145,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: warranty-disclaimer
+        spdx_license_expression: LicenseRef-scancode-warranty-disclaimer
         rule_identifier: warranty-disclaimer_78.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_78.RULE
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 461900f837c..f3fe7b6aee3 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
@@ -8,6 +8,7 @@ other_license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later AND GPL-3.0
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus AND gpl-3.0
+    license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 12
@@ -17,6 +18,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -29,6 +31,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -53,6 +56,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_378.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_378.RULE
@@ -65,6 +69,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
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 7c035acfee7..aa16873274f 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
@@ -21,6 +21,7 @@ other_license_expression_spdx: (LGPL-2.1-only AND LGPL-2.1-only) AND (GPL-2.0-on
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 38
@@ -30,6 +31,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -53,6 +55,7 @@ other_license_detections:
           \ OF SUCH DAMAGE."
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 63
@@ -62,6 +65,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -74,6 +78,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_353.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_353.RULE
@@ -97,6 +102,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1290.RULE
@@ -105,6 +111,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/GPL-2 file.
     identifier: gpl_2_0-22f74d38-e594-125c-2e35-76df8364a68b
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 79
@@ -114,6 +121,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -126,6 +134,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_983.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_983.RULE
@@ -147,6 +156,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/GPL-2 file.
     identifier: gpl_2_0_plus-fe100017-b30d-a3e1-08b9-40cc9f056db5
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 96
@@ -156,6 +166,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -168,6 +179,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_453.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_453.RULE
@@ -188,6 +200,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/GPL-2.1 file.
     identifier: lgpl_2_1-eef28a01-301f-7c68-9a3d-06ca8557b06f
   - license_expression: isc AND ibm-dhcp
+    license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp
     matches:
       - score: '100.0'
         start_line: 113
@@ -197,6 +210,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -220,6 +234,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
         rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
@@ -245,6 +260,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGES.
     identifier: isc_and_ibm_dhcp-d539ba65-a2a0-2bb1-a2a4-c389ed251972
   - license_expression: xfree86-1.0
+    license_expression_spdx: LicenseRef-scancode-xfree86-1.0
     matches:
       - score: '100.0'
         start_line: 148
@@ -254,6 +270,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: xfree86-1.0
+        spdx_license_expression: LicenseRef-scancode-xfree86-1.0
         rule_identifier: xfree86-1.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/xfree86-1.0_2.RULE
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 8c5e79d60a2..e26d845b7a5 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
@@ -12,6 +12,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: openldap-2.8
+    license_expression_spdx: OLDAP-2.8
     matches:
       - score: '100.0'
         start_line: 17
@@ -21,6 +22,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8_21.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_21.RULE
@@ -54,6 +56,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_16.RULE
@@ -101,6 +104,7 @@ license_detections:
           holders.
     identifier: openldap_2_8-a2059e16-441f-3cbf-7ca5-4d2d30253c32
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 91
@@ -110,6 +114,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_483.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
@@ -133,6 +138,7 @@ license_detections:
           # THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-c00d5dad-390d-222f-7182-5d856cf7b8de
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 115
@@ -142,6 +148,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty_2.RULE
@@ -156,6 +163,7 @@ license_detections:
           # PARTICULAR PURPOSE.
     identifier: fsf_unlimited_no_warranty-05f3eea9-e9cc-944d-4dc4-2b53a3e39319
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '95.0'
         start_line: 129
@@ -165,6 +173,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp_5.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_5.RULE
@@ -188,6 +197,7 @@ license_detections:
            * 4. This notice may not be removed or altered.
     identifier: hs_regexp-32499786-31ce-3850-a6f6-cd86b15e63f6
   - license_expression: ibm-dhcp
+    license_expression_spdx: LicenseRef-scancode-ibm-dhcp
     matches:
       - score: '100.0'
         start_line: 154
@@ -197,6 +207,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
         rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
@@ -223,6 +234,7 @@ license_detections:
            * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
     identifier: ibm_dhcp-dbdce127-2353-307e-a8ca-9b4b36d360d0
   - license_expression: ietf
+    license_expression_spdx: LicenseRef-scancode-ietf
     matches:
       - score: '100.0'
         start_line: 180
@@ -232,6 +244,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
         rule_identifier: ietf_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_5.RULE
@@ -256,6 +269,7 @@ license_detections:
           \ OF\n#    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE."
     identifier: ietf-23d2fb67-3930-da5a-2c51-1eb7124a6cd1
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 227
@@ -265,6 +279,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -283,6 +298,7 @@ license_detections:
            * SOFTWARE.
     identifier: isc-fbf6f8d8-a949-0427-62b2-aef52fe84e71
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 245
@@ -292,6 +308,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_203.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_203.RULE
@@ -301,6 +318,7 @@ license_detections:
           \ * is preserved."
     identifier: other_permissive-a2d2ef7c-de65-e9c1-5dc3-80a1fa867e5f
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 277
@@ -310,6 +328,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_200.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_200.RULE
@@ -320,6 +339,7 @@ license_detections:
           \ from this software without prior written permission."
     identifier: other_permissive-cb1634c7-cff6-c876-793d-9679f4c49378
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 311
@@ -329,6 +349,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
@@ -344,6 +365,7 @@ license_detections:
           # without express or implied warranty.
     identifier: mit_old_style_no_advert-469a8f5b-14cb-1cf1-ac4f-fd7a23bb63e5
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 327
@@ -353,6 +375,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_199.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_199.RULE
@@ -361,6 +384,7 @@ license_detections:
           distribute verbatim copies of this document is granted.
     identifier: other_permissive-37dc9756-e211-83ce-e703-b3275e50e484
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '95.0'
         start_line: 337
@@ -370,6 +394,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp_5.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_5.RULE
@@ -392,6 +417,7 @@ license_detections:
            * 4. This notice may not be removed or altered.
     identifier: hs_regexp-32499786-31ce-3850-a6f6-cd86b15e63f6
   - license_expression: openldap-2.8
+    license_expression_spdx: OLDAP-2.8
     matches:
       - score: '100.0'
         start_line: 359
@@ -401,6 +427,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_15.RULE
@@ -411,6 +438,7 @@ license_detections:
            * in file LICENSE in the top-level directory of the distribution.
     identifier: openldap_2_8-99672c54-2a17-1ad2-398b-76ba3e6834cc
   - license_expression: bsla AND bsd-original-uc
+    license_expression_spdx: BSD-4.3TAHOE AND BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 368
@@ -420,6 +448,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
         rule_identifier: bsla_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsla_3.RULE
@@ -443,6 +472,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_25.RULE
@@ -451,6 +481,7 @@ license_detections:
           clause from above.
     identifier: bsla_and_bsd_original_uc-baf8c66c-255a-4e0e-885f-a17e5d67094e
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 388
@@ -460,6 +491,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -499,6 +531,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_24.RULE
@@ -509,6 +542,7 @@ license_detections:
           ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     identifier: bsd_original_uc-7d861d8c-b658-cbe9-abaf-82bd99b2f466
   - license_expression: bsd-original-uc-1986
+    license_expression_spdx: BSD-4.3RENO
     matches:
       - score: '99.0'
         start_line: 426
@@ -518,6 +552,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc-1986
+        spdx_license_expression: BSD-4.3RENO
         rule_identifier: bsd-original-uc-1986_3.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc-1986_3.RULE
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 ae8d9618560..424bafcb547 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
@@ -11,6 +11,7 @@ other_license_expression_spdx: (LGPL-3.0-or-later AND LGPL-3.0-or-later) AND (GP
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 15
@@ -20,6 +21,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -32,6 +34,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_173.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_173.RULE
@@ -53,6 +56,7 @@ other_license_detections:
           version 3 can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-c84eb3ae-8936-b3a7-4f16-d8137a955f29
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 32
@@ -62,6 +66,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -74,6 +79,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_323.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_323.RULE
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 cc237107a7c..0e36ff52b5d 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
@@ -20,6 +20,7 @@ other_license_expression_spdx: BSD-2-Clause AND BSD-2-Clause AND (GPL-2.0-or-lat
 license_detections: []
 other_license_detections:
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 27
@@ -29,6 +30,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -38,6 +40,7 @@ other_license_detections:
           modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-ed3d6762-95f0-131d-94c5-834f10d192a2
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+    license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception
     matches:
       - score: '100.0'
         start_line: 39
@@ -47,6 +50,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
         rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_8.RULE
@@ -66,6 +70,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_with_libtool_exception_2_0-e1a8cc64-f5eb-97cf-c90d-a5d265d7d63f
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 54
@@ -75,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -87,6 +93,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_842.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_842.RULE
@@ -100,6 +107,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus-db94a8a0-a1a1-5b56-3906-697a3aec3c2d
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 63
@@ -109,6 +117,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -121,6 +130,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_387.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_387.RULE
@@ -134,6 +144,7 @@ other_license_detections:
           can be found in the file `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-19176ed3-f40f-a50b-29ca-3d0d961d6743
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 73
@@ -143,6 +154,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_5.RULE
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 b30cecc76eb..fbe92b269c2 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
@@ -31,6 +31,7 @@ other_license_expression_spdx: (LGPL-2.0-or-later AND LGPL-2.0-or-later) AND Lic
 license_detections: []
 other_license_detections:
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 85
@@ -40,6 +41,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_324.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_324.RULE
@@ -49,6 +51,7 @@ other_license_detections:
           It is provided "as is" without express or implied warranty.
     identifier: other_permissive-030a04e3-fab9-cc90-a7eb-341ec19285d1
   - license_expression: x11
+    license_expression_spdx: ICU
     matches:
       - score: '100.0'
         start_line: 90
@@ -58,6 +61,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11
+        spdx_license_expression: ICU
         rule_identifier: x11_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11_2.RULE
@@ -91,6 +95,7 @@ other_license_detections:
           of their respective owners.
     identifier: x11-fa1d6e22-e05b-6093-6d7b-b82e9d97a910
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 118
@@ -100,6 +105,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -112,6 +118,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_529.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_529.RULE
@@ -130,6 +137,7 @@ other_license_detections:
           License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
     identifier: lgpl_2_0_plus-4c6098f7-5b22-4023-84df-76b5f2165c85
   - license_expression: tcl
+    license_expression_spdx: TCL
     matches:
       - score: '100.0'
         start_line: 133
@@ -139,6 +147,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: tcl
+        spdx_license_expression: TCL
         rule_identifier: tcl_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE
@@ -184,6 +193,7 @@ other_license_detections:
           terms specified in this license.
     identifier: tcl-5f656d8e-004e-b8eb-6b96-10577123cfec
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 174
@@ -193,6 +203,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_57.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_57.RULE
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 f14760fe5cf..60430c78490 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
@@ -738,6 +738,7 @@ other_license_expression_spdx: ((GPL-1.0-or-later AND GPL-1.0-only) OR (Artistic
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 2100
@@ -747,6 +748,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -759,6 +761,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_249.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_249.RULE
@@ -767,6 +770,7 @@ other_license_detections:
           license can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1-25729df7-c7a2-c465-4e3a-95c8bbfa2166
   - license_expression: gpl-1.0-plus AND gpl-1.0
+    license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
       - score: '100.0'
         start_line: 2104
@@ -776,6 +780,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE
@@ -788,6 +793,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
         rule_identifier: gpl-1.0_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_38.RULE
@@ -796,6 +802,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-1'.
     identifier: gpl_1_0_plus_and_gpl_1_0-6a152a01-a4b1-59a8-bc68-c255f8f729e1
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 2108
@@ -805,6 +812,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -817,6 +825,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1040.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1040.RULE
@@ -826,6 +835,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-592736dd-25b8-8a93-9c9d-661b18b9e615
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 2113
@@ -835,6 +845,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
@@ -847,6 +858,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_2.RULE
@@ -855,6 +867,7 @@ other_license_detections:
           Artistic Licence can be found in `/usr/share/common-licenses/Artistic'.
     identifier: artistic_perl_1_0-28364b45-8110-28fe-aee5-cb6a37853295
   - license_expression: artistic-2.0
+    license_expression_spdx: Artistic-2.0
     matches:
       - score: '100.0'
         start_line: 2118
@@ -864,6 +877,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
         rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
@@ -1052,6 +1066,7 @@ other_license_detections:
           OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: artistic_2_0-bc78b6a9-7dba-285f-7e81-1b30d7b5e445
   - license_expression: bzip2-libbzip-2010
+    license_expression_spdx: bzip2-1.0.6
     matches:
       - score: '100.0'
         start_line: 2302
@@ -1061,6 +1076,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
         rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
@@ -1097,6 +1113,7 @@ other_license_detections:
            SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bzip2_libbzip_2010-72b4db44-6142-9aeb-acd2-1d8f2447148c
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 2337
@@ -1106,6 +1123,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -1127,6 +1145,7 @@ other_license_detections:
            3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 2354
@@ -1136,6 +1155,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1159,6 +1179,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2373
@@ -1168,6 +1189,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -1197,6 +1219,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '98.25'
         start_line: 2398
@@ -1206,6 +1229,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_80.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_80.RULE
@@ -1239,6 +1263,7 @@ other_license_detections:
           EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_original-3dc9cdcb-7881-5f58-5eb0-abe40fe6974d
   - license_expression: unicode-dfs-2015
+    license_expression_spdx: Unicode-DFS-2015
     matches:
       - score: '99.57'
         start_line: 2428
@@ -1248,6 +1273,7 @@ other_license_detections:
         match_coverage: '99.57'
         matcher: 3-seq
         license_expression: unicode-dfs-2015
+        spdx_license_expression: Unicode-DFS-2015
         rule_identifier: unicode-dfs-2015_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode-dfs-2015_9.RULE
@@ -1309,6 +1335,7 @@ other_license_detections:
                prior written authorization of the copyright holder.
     identifier: unicode_dfs_2015-a68362d0-e886-6936-9f94-af7247f63c6f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2485
@@ -1318,6 +1345,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_313.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_313.RULE
@@ -1347,6 +1375,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-df1e02c8-d8f1-e983-3d20-fffa0788153b
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2510
@@ -1356,6 +1385,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -1385,6 +1415,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: regexp
+    license_expression_spdx: Spencer-86
     matches:
       - score: '100.0'
         start_line: 2535
@@ -1394,6 +1425,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: regexp
+        spdx_license_expression: Spencer-86
         rule_identifier: regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/regexp.LICENSE
@@ -1413,6 +1445,7 @@ other_license_detections:
                    be misrepresented as being the original software.
     identifier: regexp-80089f45-0a6c-4f30-e4b6-24334a206225
   - license_expression: ttwl
+    license_expression_spdx: TTWL
     matches:
       - score: '100.0'
         start_line: 2550
@@ -1422,6 +1455,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: ttwl
+        spdx_license_expression: TTWL
         rule_identifier: ttwl.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ttwl.LICENSE
@@ -1433,6 +1467,7 @@ other_license_detections:
           unless it passes the unmodified Text::Tabs test suite.
     identifier: ttwl-eeadd029-25f0-a4b1-0af8-c75212d02135
   - license_expression: other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
       - score: '100.0'
         start_line: 2557
@@ -1442,6 +1477,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
         rule_identifier: other-copyleft_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_20.RULE
@@ -1451,6 +1487,7 @@ other_license_detections:
           way you wish, provided you do not restrict others from doing the same.
     identifier: other_copyleft-c7bd5df8-17ea-832d-36d6-a7557d00fb09
   - license_expression: other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
       - score: '90.0'
         start_line: 2562
@@ -1460,6 +1497,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
         rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
@@ -1468,6 +1506,7 @@ other_license_detections:
           of this license document, but changing it is not allowed.
     identifier: other_copyleft-0ac0d4dd-1063-c305-80e8-d67a64a53eaf
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 2569
@@ -1477,6 +1516,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_45.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE
@@ -1489,6 +1529,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_285.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE
@@ -1501,6 +1542,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
@@ -1513,12 +1555,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public  domain
     identifier: public_domain-d6560563-b3c0-65ee-7cca-7225d652d54d
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+    license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 2588
@@ -1528,6 +1572,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
         rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
@@ -1559,6 +1604,7 @@ other_license_detections:
           version 2.2 of Bison.
     identifier: gpl_3_0_plus_with_bison_exception_2_2-637d6c30-89c5-8764-b189-8bb20227ccfc
   - license_expression: paul-hsieh-derivative
+    license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative
     matches:
       - score: '100.0'
         start_line: 2615
@@ -1568,6 +1614,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: paul-hsieh-derivative
+        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
         rule_identifier: paul-hsieh-derivative_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/paul-hsieh-derivative_1.RULE
@@ -1590,6 +1637,7 @@ other_license_detections:
              is not necessary.
     identifier: paul_hsieh_derivative-227e82af-732d-87b3-eb2c-9409d183d572
   - license_expression: bsd-x11
+    license_expression_spdx: LicenseRef-scancode-bsd-x11
     matches:
       - score: '99.0'
         start_line: 2636
@@ -1599,6 +1647,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-x11
+        spdx_license_expression: LicenseRef-scancode-bsd-x11
         rule_identifier: bsd-x11_10.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-x11_10.RULE
@@ -1631,6 +1680,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_x11-53db30c9-af29-3609-e3c2-f3c4ac87fabe
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 2663
@@ -1640,6 +1690,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -1652,6 +1703,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_155.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE
@@ -1778,6 +1830,7 @@ other_license_detections:
              to this CC0 or use of the Work.
     identifier: cc0_1_0-d16cc04e-8802-8225-9e6f-0fb92bcba694
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 2790
@@ -1787,6 +1840,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
@@ -1797,6 +1851,7 @@ other_license_detections:
           warranty.
     identifier: fsf_ap-a7d380d0-4462-458a-36c1-1852bdcbf538
   - license_expression: artistic-dist-1.0
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
       - score: '100.0'
         start_line: 2796
@@ -1806,6 +1861,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
         rule_identifier: artistic-dist-1.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-dist-1.0.LICENSE
@@ -1937,6 +1993,7 @@ other_license_detections:
                                           The End
     identifier: artistic_dist_1_0-c8a5103b-b244-055a-58c3-4fd73f491e6a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 20
@@ -1946,6 +2003,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
@@ -1960,6 +2018,7 @@ other_license_detections:
              b) the "Artistic License" which comes with Perl.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-95ef4a7b-575e-74fe-2260-6fb5805fd955
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 47
@@ -1969,12 +2028,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 54
@@ -1984,12 +2045,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 64
@@ -1999,12 +2062,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 72
@@ -2014,12 +2079,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 82
@@ -2029,12 +2096,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 113
@@ -2044,6 +2113,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2052,6 +2122,7 @@ other_license_detections:
            License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 126
@@ -2061,6 +2132,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -2069,6 +2141,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 136
@@ -2078,12 +2151,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_14.RULE
         rule_relevance: 100
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 146
@@ -2093,6 +2168,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
@@ -2102,6 +2178,7 @@ other_license_detections:
           at your option, any later version of Perl 5 you may have available.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-c184d674-b309-2d8f-2170-8340d9b74afc
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 154
@@ -2111,6 +2188,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2119,6 +2197,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 162
@@ -2128,6 +2207,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2136,6 +2216,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 170
@@ -2145,12 +2226,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         matched_text: All files are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4e05fce9-1807-80b2-856e-0fa39a440170
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '90.91'
         start_line: 177
@@ -2160,12 +2243,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         matched_text: The PerlUi class is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-522746e5-bffc-fa4c-ea81-334067779aac
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '91.67'
         start_line: 185
@@ -2175,12 +2260,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         matched_text: The Symbian port is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-7e59d507-72c7-19bf-6165-d58bcc316f9a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '195'
@@ -2190,6 +2277,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
@@ -2198,6 +2286,7 @@ other_license_detections:
           as Perl.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-2ed96cd5-955e-4781-7dd3-7bcd315fff9b
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 202
@@ -2207,6 +2296,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2215,6 +2305,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 212
@@ -2224,6 +2315,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -2232,6 +2324,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 220
@@ -2241,6 +2334,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2249,6 +2343,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 228
@@ -2258,6 +2353,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2266,6 +2362,7 @@ other_license_detections:
           terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 236
@@ -2275,6 +2372,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2283,6 +2381,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 246
@@ -2292,6 +2391,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2300,6 +2400,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 258
@@ -2309,12 +2410,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 264
@@ -2324,6 +2427,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
@@ -2332,6 +2436,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-fc24870c-10ae-2148-d3bf-e786583923db
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 278
@@ -2341,12 +2446,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 284
@@ -2356,6 +2463,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
@@ -2364,6 +2472,7 @@ other_license_detections:
           same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-7efcdd95-ec2e-48b4-6b08-e8b6a41ced5d
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 293
@@ -2373,6 +2482,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
@@ -2382,6 +2492,7 @@ other_license_detections:
           any later version of Perl 5.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8ca7b680-12a9-c6a8-d60b-abd1b0e1aa81
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 303
@@ -2391,6 +2502,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
@@ -2399,6 +2511,7 @@ other_license_detections:
           same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-7efcdd95-ec2e-48b4-6b08-e8b6a41ced5d
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 312
@@ -2408,6 +2521,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_13.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_13.RULE
@@ -2422,6 +2536,7 @@ other_license_detections:
           b) the "Artistic License" which comes with this kit.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-01827891-d8b3-db54-a82c-45e2a8af8edc
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 325
@@ -2431,6 +2546,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2439,6 +2555,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 345
@@ -2448,6 +2565,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2456,6 +2574,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 358
@@ -2465,6 +2584,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2473,6 +2593,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 365
@@ -2482,6 +2603,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2490,6 +2612,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 374
@@ -2499,12 +2622,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         matched_text: You may redistribute this under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-d15d44f1-6970-d898-4fa2-eb72ec024222
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 382
@@ -2514,6 +2639,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2522,6 +2648,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 394
@@ -2531,6 +2658,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2539,6 +2667,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 402
@@ -2548,6 +2677,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2556,6 +2686,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 410
@@ -2565,6 +2696,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2573,6 +2705,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 417
@@ -2582,6 +2715,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2590,6 +2724,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 427
@@ -2599,6 +2734,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2607,6 +2743,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 435
@@ -2616,6 +2753,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2624,6 +2762,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 444
@@ -2633,6 +2772,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2641,6 +2781,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 454
@@ -2650,6 +2791,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2658,6 +2800,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 462
@@ -2667,6 +2810,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2675,6 +2819,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 469
@@ -2684,6 +2829,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2692,6 +2838,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-2.0
+    license_expression_spdx: Artistic-2.0
     matches:
       - score: '100.0'
         start_line: 476
@@ -2701,6 +2848,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
         rule_identifier: artistic-2.0_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_38.RULE
@@ -2709,6 +2857,7 @@ other_license_detections:
           under the terms of the the Artistic License (2.0).
     identifier: artistic_2_0-e78d6739-c4ab-40c9-572b-bcaabfb23964
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 484
@@ -2718,6 +2867,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2726,6 +2876,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 492
@@ -2735,6 +2886,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2743,6 +2895,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 500
@@ -2752,6 +2905,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
@@ -2768,6 +2922,7 @@ other_license_detections:
           file.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3c906dee-c087-db95-4092-056433d16fb5
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 517
@@ -2777,6 +2932,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2785,6 +2941,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 524
@@ -2794,6 +2951,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
@@ -2802,6 +2960,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-18449fdf-781e-7e30-7f07-dfe1ecca6ee1
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 540
@@ -2811,6 +2970,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
@@ -2819,6 +2979,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-fc24870c-10ae-2148-d3bf-e786583923db
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 549
@@ -2828,6 +2989,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2836,6 +2998,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 558
@@ -2845,6 +3008,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2853,6 +3017,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 568
@@ -2862,6 +3027,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2870,6 +3036,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 576
@@ -2879,6 +3046,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
@@ -2890,6 +3058,7 @@ other_license_detections:
           later version.
     identifier: artistic_perl_1_0_or_gpl_2_0_plus-9838542c-8067-e5da-446d-8a162c7c3cc5
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 587
@@ -2899,6 +3068,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2907,6 +3077,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 595
@@ -2916,6 +3087,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2924,6 +3096,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 603
@@ -2933,6 +3106,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2941,6 +3115,7 @@ other_license_detections:
           it and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 613
@@ -2950,6 +3125,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2958,6 +3134,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 621
@@ -2967,6 +3144,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2975,6 +3153,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 630
@@ -2984,6 +3163,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2992,6 +3172,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 638
@@ -3001,6 +3182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
@@ -3009,6 +3191,7 @@ other_license_detections:
           or the Artistic License, as specified in the LICENCE file.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-998f11a5-2f46-f75b-3298-dbfa69a673aa
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 646
@@ -3018,6 +3201,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3026,6 +3210,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 657
@@ -3035,6 +3220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3043,6 +3229,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 664
@@ -3052,6 +3239,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3060,6 +3248,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 676
@@ -3069,6 +3258,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3077,6 +3267,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 684
@@ -3086,6 +3277,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
@@ -3095,6 +3287,7 @@ other_license_detections:
           redistribute it and/or modify it under the same terms as Perl itself.
     identifier: mit_or_gpl_1_0_plus_or_artistic_perl_1_0-109da13c-da24-fa09-6ec8-f6606ea1dddf
   - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '99.0'
         start_line: 700
@@ -3104,6 +3297,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
@@ -3112,6 +3306,7 @@ other_license_detections:
           the rest of the Locale-Maketext-Simple distribution.
     identifier: mit_or_artistic_perl_1_0_or_gpl_1_0_plus-5a94f7ce-d5c0-58cd-b181-c00f8fbbc497
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 707
@@ -3121,6 +3316,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3129,6 +3325,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 715
@@ -3138,6 +3335,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
@@ -3149,6 +3347,7 @@ other_license_detections:
           Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8e682309-5b67-ab89-6945-3ea7a79aa541
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 727
@@ -3158,6 +3357,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3166,6 +3366,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND metamail
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail
     matches:
       - score: '100.0'
         start_line: 736
@@ -3175,6 +3376,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3189,6 +3391,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: metamail
+        spdx_license_expression: metamail
         rule_identifier: metamail.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
@@ -3205,6 +3408,7 @@ other_license_detections:
            WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and_metamail-708741c8-a456-165a-5e15-4d96c736bb61
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 761
@@ -3214,6 +3418,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3222,6 +3427,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 769
@@ -3231,6 +3437,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3239,6 +3446,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 777
@@ -3248,12 +3456,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         matched_text: This module is released under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-6ac722a3-703c-e413-9b17-5dd475d88fa5
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 784
@@ -3263,6 +3473,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -3271,6 +3482,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 792
@@ -3280,6 +3492,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3288,6 +3501,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 800
@@ -3297,6 +3511,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -3305,6 +3520,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 808
@@ -3314,6 +3530,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3323,6 +3540,7 @@ other_license_detections:
           as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 817
@@ -3332,6 +3550,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3340,6 +3559,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 827
@@ -3349,6 +3569,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3357,6 +3578,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 836
@@ -3366,6 +3588,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3374,6 +3597,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 868
@@ -3383,6 +3607,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3391,6 +3616,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 882
@@ -3400,6 +3626,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3408,6 +3635,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 890
@@ -3417,6 +3645,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3425,6 +3654,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 898
@@ -3434,6 +3664,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3443,6 +3674,7 @@ other_license_detections:
           as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '56.14'
         start_line: 908
@@ -3452,6 +3684,7 @@ other_license_detections:
         match_coverage: '59.09'
         matcher: 3-seq
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
@@ -3460,6 +3693,7 @@ other_license_detections:
           is licensed under the same terms as
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-f8a67153-d3ca-59da-be8b-68b1535b0862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 916
@@ -3469,6 +3703,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3477,6 +3712,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 924
@@ -3486,6 +3722,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3494,6 +3731,8 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 AND public-domain AND (artistic-2.0 AND public-domain-disclaimer)
+    license_expression_spdx: Artistic-1.0-Perl AND LicenseRef-scancode-public-domain AND (Artistic-2.0
+      AND LicenseRef-scancode-public-domain-disclaimer)
     matches:
       - score: '100.0'
         start_line: 939
@@ -3503,6 +3742,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_12.RULE
@@ -3520,6 +3760,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_286.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
@@ -3537,6 +3778,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
@@ -3546,6 +3788,7 @@ other_license_detections:
            them as you see fit (and at your own risk with no warranty from anyone).
     identifier: artistic_perl_1_0_and_public_domain_and__artistic_2_0_and_public_domain_disclaimer-2d510dad-1736-1044-1f83-ffc03282e54a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 964
@@ -3555,6 +3798,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3564,6 +3808,7 @@ other_license_detections:
           as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 973
@@ -3573,6 +3818,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3581,6 +3827,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 981
@@ -3590,6 +3837,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3598,6 +3846,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 998
@@ -3607,6 +3856,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3615,6 +3865,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1017
@@ -3624,6 +3875,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
@@ -3632,6 +3884,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8104884-0d49-693f-2246-ae9522b0bf98
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1025
@@ -3641,6 +3894,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3649,6 +3903,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1033
@@ -3658,6 +3913,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3666,6 +3922,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1042
@@ -3675,6 +3932,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3683,6 +3941,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1051
@@ -3692,6 +3951,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3700,6 +3960,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1060
@@ -3709,6 +3970,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3717,6 +3979,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1068
@@ -3726,6 +3989,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3734,6 +3998,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1084
@@ -3743,6 +4008,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3751,6 +4017,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1092
@@ -3760,6 +4027,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -3774,6 +4042,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_287.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
@@ -3785,6 +4054,7 @@ other_license_detections:
           credit would be courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-1eb230bb-78ce-5300-5012-920fd3811563
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1107
@@ -3794,6 +4064,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3802,6 +4073,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1114
@@ -3811,6 +4083,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3819,6 +4092,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 1126
@@ -3828,6 +4102,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_154.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_154.RULE
@@ -3837,6 +4112,7 @@ other_license_detections:
           end of this file.
     identifier: cc0_1_0-ce0a113c-2f14-79cb-71e2-f8d26c4e9bc9
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1136
@@ -3846,6 +4122,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3854,6 +4131,7 @@ other_license_detections:
           modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 1144
@@ -3863,6 +4141,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
@@ -3873,6 +4152,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-825f9c5f-31da-bfc2-ad53-0cceccade3a2
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1161
@@ -3882,6 +4162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
@@ -3895,6 +4176,7 @@ other_license_detections:
           Public License.
     identifier: artistic_perl_1_0_or_gpl_2_0_plus-b35b8478-ff32-af71-be53-77500ee9fe8c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1181
@@ -3904,6 +4186,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
@@ -3915,6 +4198,7 @@ other_license_detections:
           the same explicit licensing information.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-4b362e04-cf63-aed3-04d0-700b12e560b9
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 1192
@@ -3924,6 +4208,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -3932,6 +4217,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1199
@@ -3941,6 +4227,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
@@ -3949,6 +4236,7 @@ other_license_detections:
           terms as Perl.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-5d9e5932-ca64-fd4b-88f4-3bdacbc03f1d
   - license_expression: bsd-new AND (gpl-1.0-plus OR artistic-perl-1.0)
+    license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl)
     matches:
       - score: '99.0'
         start_line: 1209
@@ -3958,6 +4246,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1065.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1065.RULE
@@ -3970,6 +4259,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
@@ -3978,6 +4268,7 @@ other_license_detections:
           terms as the rest of the distribution.
     identifier: bsd_new_and__gpl_1_0_plus_or_artistic_perl_1_0-66a31b89-70bb-c59f-36de-c76a8ce944e0
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1219
@@ -3987,6 +4278,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3995,6 +4287,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 1227
@@ -4004,12 +4297,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_14.RULE
         rule_relevance: 100
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1237
@@ -4019,6 +4314,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -4027,6 +4323,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1249
@@ -4036,6 +4333,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
@@ -4047,6 +4345,7 @@ other_license_detections:
           as Perl itself and contained this copyright notice:
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a0e346e-31dc-322f-05d4-2902f683ce20
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1263
@@ -4056,6 +4355,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -4064,6 +4364,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '99.0'
         start_line: 1300
@@ -4073,6 +4374,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
@@ -4081,6 +4383,7 @@ other_license_detections:
           It is assumed that they are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-8aa4724c-ae7c-4733-1063-b0a456c393d4
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1309
@@ -4090,6 +4393,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
@@ -4098,6 +4402,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-32b9c99f-78d4-e645-c66f-2f10debb1d78
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1318
@@ -4107,6 +4412,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -4115,6 +4421,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1326
@@ -4124,6 +4431,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4132,6 +4440,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1335
@@ -4141,6 +4450,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4149,6 +4459,8 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND (gpl-1.0-plus OR artistic-perl-1.0)
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND (GPL-1.0-or-later OR
+      Artistic-1.0-Perl)
     matches:
       - score: '100.0'
         start_line: 1344
@@ -4158,6 +4470,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4172,6 +4485,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
@@ -4180,6 +4494,7 @@ other_license_detections:
           Porters, which was released under the same license terms.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and__gpl_1_0_plus_or_artistic_perl_1_0-00e61bda-5cd5-19fb-b521-ca0d569c0379
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1355
@@ -4189,6 +4504,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -4197,6 +4513,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 1362
@@ -4206,6 +4523,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -4214,6 +4532,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1371
@@ -4223,6 +4542,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4231,6 +4551,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1379
@@ -4240,6 +4561,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
@@ -4248,6 +4570,7 @@ other_license_detections:
           as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bc101dac-fad1-f7aa-f226-ac50d2a1e9f3
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1387
@@ -4257,6 +4580,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4265,6 +4589,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1396
@@ -4274,6 +4599,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4288,6 +4614,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
@@ -4297,6 +4624,7 @@ other_license_detections:
           the correct attribution.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-022b9900-7aee-6501-6734-49f6ea2c95da
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1408
@@ -4306,12 +4634,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1415
@@ -4321,6 +4651,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4329,6 +4660,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1422
@@ -4338,12 +4670,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1429
@@ -4353,6 +4687,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -4361,6 +4696,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1437
@@ -4370,12 +4706,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         matched_text: This program is distributed under the same terms as perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-2bcbbce8-54f0-bccc-2196-d6690e456d84
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1444
@@ -4385,6 +4723,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -4393,6 +4732,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1455
@@ -4402,6 +4742,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -4410,6 +4751,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1463
@@ -4419,6 +4761,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4427,6 +4770,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1473
@@ -4436,6 +4780,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
@@ -4449,6 +4794,7 @@ other_license_detections:
           under the terms of the "BSD-3-clause-GENERIC" license included in this file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and_bsd_new-4ecf727d-f402-75d3-46ee-1a9cb87ec7cb
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1502
@@ -4458,6 +4804,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4466,6 +4813,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1513
@@ -4475,6 +4823,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
@@ -4483,6 +4832,7 @@ other_license_detections:
           it under the same terms as Perl
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-0aab4f56-a9e1-f787-6f06-4a75c1c9b81e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1522
@@ -4492,6 +4842,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4500,6 +4851,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1533
@@ -4509,6 +4861,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4517,6 +4870,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1543
@@ -4526,6 +4880,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4534,6 +4889,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1563
@@ -4543,6 +4899,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4551,6 +4908,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1573
@@ -4560,6 +4918,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
@@ -4569,6 +4928,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-3b848d2f-500b-c107-aa42-9eb5c222ff60
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1585
@@ -4578,6 +4938,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4586,6 +4947,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1593
@@ -4595,6 +4957,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4603,6 +4966,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1602
@@ -4612,6 +4976,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4620,6 +4985,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1612
@@ -4629,6 +4995,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
@@ -4637,6 +5004,7 @@ other_license_detections:
           distribution is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-1a86e593-e255-ed0a-e5a1-d8fdbea5e365
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1620
@@ -4646,6 +5014,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4654,6 +5023,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1628
@@ -4663,6 +5033,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
@@ -4671,6 +5042,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-0c90b422-60c3-e525-05ea-c266dd2a51b1
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1636
@@ -4680,6 +5052,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4688,6 +5061,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1644
@@ -4697,6 +5071,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
@@ -4706,6 +5081,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-baa14b4d-271c-af68-77f4-4cfd796ec9ea
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1655
@@ -4715,6 +5091,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
@@ -4722,6 +5099,7 @@ other_license_detections:
           itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-c6a20c55-7328-0e53-7889-7c78c5415d0b
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1662
@@ -4731,6 +5109,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4739,6 +5118,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1670
@@ -4748,6 +5128,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
@@ -4757,6 +5138,7 @@ other_license_detections:
            License:     Artistic/GPL
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-21b340f7-1c33-9e19-4d95-6db009738447
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1679
@@ -4766,6 +5148,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4774,6 +5157,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-1.0
+    license_expression_spdx: Artistic-1.0
     matches:
       - score: '90.0'
         start_line: 1687
@@ -4783,12 +5167,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-1.0
+        spdx_license_expression: Artistic-1.0
         rule_identifier: artistic-1.0_11.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE
         matched_text: the artistic license.
     identifier: artistic_1_0-2ff80857-def0-0ed3-86d0-f745062039f9
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1707
@@ -4798,6 +5184,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
@@ -4806,6 +5193,7 @@ other_license_detections:
           It is assumed that it is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-71dd85f2-c2a8-e634-a472-12fad824a9b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1716
@@ -4815,6 +5203,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
@@ -4829,6 +5218,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4837,6 +5227,7 @@ other_license_detections:
            modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4608b132-68af-fc8c-5b55-7bfbd0034d22
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1733
@@ -4846,6 +5237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
@@ -4855,6 +5247,7 @@ other_license_detections:
           at your option, any later version of Perl 5 you may have available.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-02d238e7-dfb3-3d0f-17b5-552ede2bf765
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1742
@@ -4864,6 +5257,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4872,6 +5266,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1751
@@ -4881,6 +5276,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4889,6 +5285,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 1758
@@ -4898,12 +5295,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_7.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_7.RULE
         matched_text: This program is distributed under the Artistic License.
     identifier: artistic_perl_1_0-2d6db20c-52be-912f-b056-8d081e123f91
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1764
@@ -4913,6 +5312,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_37.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_37.RULE
@@ -4921,6 +5321,7 @@ other_license_detections:
           It is assumed that it is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-83df0e4e-ee81-a531-f469-f98c96477f44
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1776
@@ -4930,6 +5331,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4938,6 +5340,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1787
@@ -4947,6 +5350,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4955,6 +5359,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1795
@@ -4964,6 +5369,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4972,6 +5378,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1814
@@ -4981,12 +5388,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1821
@@ -4996,6 +5405,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
@@ -5004,6 +5414,7 @@ other_license_detections:
           itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-995430fd-ab65-9897-2857-c13429160160
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1833
@@ -5013,6 +5424,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -5027,6 +5439,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_286.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
@@ -5038,6 +5451,7 @@ other_license_detections:
           be courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-93862a24-32df-2e58-a989-877ba708872a
   - license_expression: artistic-2.0 AND public-domain-disclaimer
+    license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 1849
@@ -5047,6 +5461,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
@@ -5056,6 +5471,7 @@ other_license_detections:
           them as you see fit (and at your own risk with no warranty from anyone).
     identifier: artistic_2_0_and_public_domain_disclaimer-0f623011-76a2-9362-7a9e-866e141da819
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1860
@@ -5065,12 +5481,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1869
@@ -5080,12 +5498,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1876
@@ -5095,12 +5515,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1886
@@ -5110,6 +5532,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -5124,6 +5547,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_287.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
@@ -5135,6 +5559,7 @@ other_license_detections:
           courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-1eb230bb-78ce-5300-5012-920fd3811563
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '1908'
@@ -5144,6 +5569,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -5152,6 +5578,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: '1916'
@@ -5161,6 +5588,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -5175,6 +5603,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_287.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
@@ -5186,6 +5615,7 @@ other_license_detections:
           courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-1eb230bb-78ce-5300-5012-920fd3811563
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: '1933'
@@ -5195,12 +5625,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: '1940'
@@ -5210,12 +5642,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: '1947'
@@ -5225,12 +5659,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '1963'
@@ -5240,6 +5676,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -5248,6 +5685,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '1985'
@@ -5257,6 +5695,8 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
@@ -5279,6 +5719,7 @@ other_license_detections:
           "Artistic-dist" tag.
     identifier: artistic_perl_1_0_or_artistic_dist_1_0_or_gpl_1_0_plus-9cd54d77-c838-d496-0a92-de100a6c75bc
   - license_expression: artistic-dist-1.0
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
       - score: '100.0'
         start_line: 2014
@@ -5288,6 +5729,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
         rule_identifier: artistic-dist-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_3.RULE
@@ -5297,6 +5739,7 @@ other_license_detections:
           under the "Artistic-dist" tag.
     identifier: artistic_dist_1_0-52936621-27b8-5371-2fc4-9a5b06005497
   - license_expression: artistic-dist-1.0 OR gpl-1.0-plus
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 2041
@@ -5306,6 +5749,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
@@ -5337,6 +5781,7 @@ other_license_detections:
           "Artistic-dist" tag.
     identifier: artistic_dist_1_0_or_gpl_1_0_plus-7fb72184-972c-40cb-2bf5-2a39c35cbc5a
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND mit
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT
     matches:
       - score: '100.0'
         start_line: 2072
@@ -5346,6 +5791,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
@@ -5366,12 +5812,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_577.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_577.RULE
         matched_text: under the Expat license.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_mit-96b88a5a-57e2-5b8b-99de-0b9196e7d3fc
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 2095
@@ -5381,6 +5829,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
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 32c866263e8..c5a3ebe5ed4 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
@@ -34,6 +34,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 17
@@ -43,6 +44,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -55,6 +57,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_267.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_267.RULE
@@ -83,6 +86,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_232.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_232.RULE
@@ -91,6 +95,7 @@ license_detections:
             /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-bcd17595-f3dd-a7e4-38d6-be996ed9d675
   - license_expression: sun-source
+    license_expression_spdx: LicenseRef-scancode-sun-source
     matches:
       - score: '100.0'
         start_line: 44
@@ -100,6 +105,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sun-source
+        spdx_license_expression: LicenseRef-scancode-sun-source
         rule_identifier: sun-source_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sun-source_1.RULE
@@ -125,6 +131,7 @@ license_detections:
            Sun has been advised of the possibility of such damages.
     identifier: sun_source-02813787-7782-d45a-b30b-598566f2f032
   - license_expression: hpnd-pbmplus
+    license_expression_spdx: HPND-Pbmplus
     matches:
       - score: '100.0'
         start_line: 68
@@ -134,6 +141,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hpnd-pbmplus
+        spdx_license_expression: HPND-Pbmplus
         rule_identifier: hpnd-pbmplus.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE
@@ -146,6 +154,7 @@ license_detections:
            implied warranty.
     identifier: hpnd_pbmplus-791a84f8-2595-c6f9-929c-722baf14af4e
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 79
@@ -155,6 +164,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -164,6 +174,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 87
@@ -173,6 +184,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -182,6 +194,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 94
@@ -191,6 +204,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -200,6 +214,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 102
@@ -209,6 +224,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_266.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_266.RULE
@@ -218,6 +234,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.
     identifier: lgpl_2_1_plus-71729f6f-ef57-95b2-a0e3-46c5dbedfe44
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 111
@@ -227,6 +244,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_711.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_711.RULE
@@ -236,6 +254,7 @@ license_detections:
            /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus-3032bd69-4dfa-eb9e-e226-72ce6f830857
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 120
@@ -245,6 +264,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -254,6 +274,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 128
@@ -263,6 +284,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -272,6 +294,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 137
@@ -281,6 +304,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -290,6 +314,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 144
@@ -299,6 +324,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -308,6 +334,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: adrian
+    license_expression_spdx: LicenseRef-scancode-adrian
     matches:
       - score: '100.0'
         start_line: 152
@@ -317,6 +344,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: adrian
+        spdx_license_expression: LicenseRef-scancode-adrian
         rule_identifier: adrian.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/adrian.LICENSE
@@ -331,6 +359,7 @@ license_detections:
            with no warranty.
     identifier: adrian-0f705124-8a69-aa6e-bdc8-c0c1997d93ed
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 164
@@ -340,6 +369,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -349,6 +379,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 171
@@ -358,6 +389,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -367,6 +399,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 179
@@ -376,6 +409,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -385,6 +419,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 187
@@ -394,6 +429,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -403,6 +439,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: '195'
@@ -412,6 +449,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -421,6 +459,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 203
@@ -430,6 +469,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -439,6 +479,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 211
@@ -448,6 +489,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -457,6 +499,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 219
@@ -466,6 +509,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -475,6 +519,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 226
@@ -484,6 +529,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -493,6 +539,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 235
@@ -502,6 +549,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -511,6 +559,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 243
@@ -520,6 +569,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -529,6 +579,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 251
@@ -538,6 +589,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -547,6 +599,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 259
@@ -556,6 +609,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -565,6 +619,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 266
@@ -574,6 +629,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -583,6 +639,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 275
@@ -592,6 +649,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -601,6 +659,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 283
@@ -610,6 +669,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -619,6 +679,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 291
@@ -628,6 +689,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -637,6 +699,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 299
@@ -646,6 +709,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -671,6 +735,7 @@ license_detections:
             SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 323
@@ -680,6 +745,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -689,6 +755,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 332
@@ -698,6 +765,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -707,6 +775,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 340
@@ -716,6 +785,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -725,6 +795,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 347
@@ -734,6 +805,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -743,6 +815,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 354
@@ -752,6 +825,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -761,6 +835,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 363
@@ -770,6 +845,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -779,6 +855,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 371
@@ -788,6 +865,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_528.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_528.RULE
@@ -797,6 +875,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.
     identifier: lgpl_2_0_plus-ebf414f2-2099-4528-86ae-45f3f720d2e0
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 382
@@ -806,6 +885,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -815,6 +895,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 389
@@ -824,6 +905,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -833,6 +915,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 397
@@ -842,6 +925,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -851,6 +935,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 405
@@ -860,6 +945,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -869,6 +955,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 413
@@ -878,6 +965,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -887,6 +975,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 422
@@ -896,6 +985,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -905,6 +995,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 430
@@ -914,6 +1005,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -923,6 +1015,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 440
@@ -932,6 +1025,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -941,6 +1035,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 447
@@ -950,6 +1045,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -959,6 +1055,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 454
@@ -968,6 +1065,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -977,6 +1075,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 465
@@ -986,6 +1085,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -995,6 +1095,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 472
@@ -1004,6 +1105,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1013,6 +1115,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 479
@@ -1022,6 +1125,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1031,6 +1135,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 487
@@ -1040,6 +1145,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1049,6 +1155,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 495
@@ -1058,6 +1165,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1067,6 +1175,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 502
@@ -1076,6 +1185,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1085,6 +1195,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 511
@@ -1094,6 +1205,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1103,6 +1215,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 518
@@ -1112,6 +1225,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1121,6 +1235,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 525
@@ -1130,6 +1245,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1139,6 +1255,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 533
@@ -1148,6 +1265,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1157,6 +1275,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 540
@@ -1166,6 +1285,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1175,6 +1295,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 547
@@ -1184,6 +1305,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1193,6 +1315,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 554
@@ -1202,6 +1325,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1211,6 +1335,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 561
@@ -1220,6 +1345,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1229,6 +1355,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 568
@@ -1238,6 +1365,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1247,6 +1375,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 576
@@ -1256,6 +1385,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_711.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_711.RULE
@@ -1265,6 +1395,7 @@ license_detections:
             /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus-3032bd69-4dfa-eb9e-e226-72ce6f830857
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 585
@@ -1274,6 +1405,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1283,6 +1415,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 594
@@ -1292,6 +1425,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1301,6 +1435,7 @@ license_detections:
            /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-e3503782-dabb-a2b9-bb59-14bddddca6ec
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 602
@@ -1310,6 +1445,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
@@ -1325,6 +1461,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
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 579c201364d..e03484654b1 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
@@ -32,6 +32,7 @@ other_license_expression_spdx: BSD-3-Clause AND BSD-3-Clause AND (Apache-2.0 AND
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 84
@@ -41,6 +42,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -53,6 +55,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
@@ -76,6 +79,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_865.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_865.RULE
@@ -84,6 +88,7 @@ other_license_detections:
           can be found in `/usr/share/common-licenses/Apache-2.0'.
     identifier: apache_2_0-e6211cc7-51f7-02d0-af92-2f8c94a2175c
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 101
@@ -93,6 +98,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -117,6 +123,7 @@ other_license_detections:
           WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: psf-2.0
+    license_expression_spdx: PSF-2.0
     matches:
       - score: '89.1'
         start_line: 121
@@ -126,6 +133,7 @@ other_license_detections:
         match_coverage: '89.1'
         matcher: 3-seq
         license_expression: psf-2.0
+        spdx_license_expression: PSF-2.0
         rule_identifier: psf-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/psf-2.0.LICENSE
@@ -181,6 +189,7 @@ other_license_detections:
           to be bound by the terms and conditions of this License Agreement.
     identifier: psf_2_0-7783998d-f3df-e1e7-edd4-22ee0d990095
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 172
@@ -190,6 +199,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
@@ -216,6 +226,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-25075703-83ad-f419-e8fc-55c5ce7e67a5
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: '194'
@@ -225,6 +236,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1072.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1072.RULE
@@ -255,6 +267,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-4d661fac-2580-23d1-8757-1ee91fd8c12f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.0'
         start_line: 76
@@ -264,6 +277,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_509.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_509.RULE
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 c10e315edfa..12a7564f576 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: reportbug
+    license_expression_spdx: LicenseRef-scancode-reportbug
     matches:
       - score: '100.0'
         start_line: 10
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: reportbug
+        spdx_license_expression: LicenseRef-scancode-reportbug
         rule_identifier: reportbug_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/reportbug_1.RULE
@@ -37,6 +39,7 @@ license_detections:
               #  SOFTWARE.
     identifier: reportbug-e60ef7fe-f574-325a-97a9-98023b9499bd
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 32
@@ -46,6 +49,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl_77.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_77.RULE
@@ -58,6 +62,7 @@ license_detections:
               can be found in file "/usr/share/common-licenses/GPL".
     identifier: gpl_1_0_plus-f1eeed44-9773-383b-20dd-aee6015f96bf
   - license_expression: reportbug AND gpl-2.0
+    license_expression_spdx: LicenseRef-scancode-reportbug AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 43
@@ -67,6 +72,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: reportbug
+        spdx_license_expression: LicenseRef-scancode-reportbug
         rule_identifier: reportbug_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/reportbug_1.RULE
@@ -95,6 +101,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
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 3e8f69e91dd..a44c439602e 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
@@ -9,6 +9,7 @@ other_license_expression_spdx: MIT AND MIT
 license_detections: []
 other_license_detections:
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 14
@@ -18,6 +19,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 50d11eb8c6e..4893de6f96d 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
@@ -9,6 +9,7 @@ other_license_expression_spdx: Sendmail AND Sendmail
 license_detections: []
 other_license_detections:
   - license_expression: sendmail
+    license_expression_spdx: Sendmail
     matches:
       - score: '97.65'
         start_line: '19'
@@ -18,6 +19,7 @@ other_license_detections:
         match_coverage: '97.65'
         matcher: 3-seq
         license_expression: sendmail
+        spdx_license_expression: Sendmail
         rule_identifier: sendmail-2014.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sendmail-2014.RULE
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 835efaa4a7d..273a405d7a8 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
@@ -33,6 +33,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 21
@@ -42,12 +43,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_136.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE
         matched_text: license BSD-2-clause
     identifier: bsd_simplified-2383ae10-5494-e069-46c2-e2d6cb56951f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 79
@@ -57,6 +60,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -86,6 +90,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '98.88'
         start_line: 106
@@ -95,6 +100,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_274.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_274.RULE
@@ -120,6 +126,7 @@ other_license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-d94468f5-485a-ebb9-1548-b7e909e0c153
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 127
@@ -129,6 +136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -152,6 +160,7 @@ other_license_detections:
           THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 145
@@ -161,6 +170,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -173,6 +183,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1142.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE
@@ -188,6 +199,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
@@ -199,6 +211,7 @@ other_license_detections:
           Public License can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-16076205-58b7-9073-142a-e00e35648f2d
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 158
@@ -208,6 +221,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -220,6 +234,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
@@ -241,6 +256,7 @@ other_license_detections:
           Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
     identifier: gpl_2_0_plus-cc17af11-ba60-7b3d-40d0-91bc262b80f8
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 175
@@ -250,6 +266,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -262,6 +279,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
@@ -286,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
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 705190399f8..321affd2a5a 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
@@ -32,6 +32,7 @@ other_license_expression_spdx: (Apache-2.0 AND Apache-2.0) AND (BSD-3-Clause OR
 license_detections: []
 other_license_detections:
   - license_expression: markus-kuhn-license
+    license_expression_spdx: HPND-Markus-Kuhn
     matches:
       - score: '100.0'
         start_line: 21
@@ -41,6 +42,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: markus-kuhn-license
+        spdx_license_expression: HPND-Markus-Kuhn
         rule_identifier: markus-kuhn-license.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/markus-kuhn-license.LICENSE
@@ -50,6 +52,7 @@ other_license_detections:
           disclaims all warranties with regard to this software.
     identifier: markus_kuhn_license-295f6fda-191f-872c-b04b-3876e296284a
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 33
@@ -59,6 +62,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_323.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_323.RULE
@@ -67,6 +71,7 @@ other_license_detections:
           without limitation, modified or unmodified, in any way, for any purpose.
     identifier: other_permissive-7bea3fe6-1cb8-bf34-9c3e-7838c62068eb
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 78
@@ -76,6 +81,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -88,6 +94,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1325.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1325.RULE
@@ -96,6 +103,7 @@ other_license_detections:
           found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-10dc4dde-c7f1-a166-da30-2c69a01c2c0f
   - license_expression: gpl-3.0-plus AND gpl-3.0
+    license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 82
@@ -105,6 +113,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -117,6 +126,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_480.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_480.RULE
@@ -125,6 +135,7 @@ other_license_detections:
           found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus_and_gpl_3_0-078c7647-d24b-f86e-aa47-7ac72abda7dc
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 86
@@ -134,6 +145,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -146,6 +158,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE
@@ -168,6 +181,7 @@ other_license_detections:
           under the License.
     identifier: apache_2_0-aeabe930-a28e-205e-e368-f6c12f1d7220
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 107
@@ -177,6 +191,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_970.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_970.RULE
@@ -208,6 +223,7 @@ other_license_detections:
           IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-a174ddc5-8db2-d884-fdfa-783911e89ca7
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 136
@@ -217,6 +233,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
@@ -243,6 +260,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-a1deb97f-56cd-71ea-a95f-82477d400503
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 158
@@ -252,6 +270,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -275,6 +294,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 177
@@ -284,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_56.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_56.RULE
@@ -322,6 +343,7 @@ other_license_detections:
           trademarks mentioned herein are the property of their respective owners.
     identifier: unicode-9705ed00-4a5e-7686-ae43-8d76e5bb8000
   - license_expression: afl-3.0
+    license_expression_spdx: AFL-3.0
     matches:
       - score: '100.0'
         start_line: 211
@@ -331,6 +353,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: afl-3.0
+        spdx_license_expression: AFL-3.0
         rule_identifier: afl-3.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/afl-3.0.LICENSE
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 583cbb9a814..dfd407fef80 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
@@ -29,6 +29,7 @@ other_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (CC
 license_detections: []
 other_license_detections:
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 62
@@ -38,6 +39,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
@@ -46,6 +48,7 @@ other_license_detections:
           warranty.
     identifier: public_domain_disclaimer-8e235ed9-5a49-0bba-be41-0bb35f0779c9
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 114
@@ -55,6 +58,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -78,6 +82,7 @@ other_license_detections:
           IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 132
@@ -87,6 +92,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -99,6 +105,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
@@ -121,6 +128,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2`
     identifier: gpl_2_0-0acbb9ac-a862-7099-0f33-caefbf2d141b
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 150
@@ -130,6 +138,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -142,6 +151,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -164,6 +174,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 168
@@ -173,6 +184,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -185,6 +197,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -207,6 +220,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 186
@@ -216,6 +230,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -228,6 +243,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
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 811db57b9af..b5184eac153 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 9
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_285.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE
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 7e392de5e81..b2e51b0349f 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: info-zip-2009-01
+    license_expression_spdx: LicenseRef-scancode-info-zip-2009-01
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: info-zip-2009-01
+        spdx_license_expression: LicenseRef-scancode-info-zip-2009-01
         rule_identifier: info-zip-2009-01_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/info-zip-2009-01_12.RULE
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 ef70979e65e..0cf15060b96 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
@@ -44,6 +44,7 @@ other_license_expression_spdx: BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause AN
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1015
@@ -53,6 +54,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_303.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
@@ -62,6 +64,7 @@ other_license_detections:
           This code is in the public domain; do with it what you wish.
     identifier: public_domain-12604376-43c0-ec4b-0941-067570a4db40
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1045
@@ -71,6 +74,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_31.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_31.RULE
@@ -97,6 +101,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-9ea803a4-ce4f-d866-25a8-4dc9652014f3
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1067
@@ -106,6 +111,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1071.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1071.RULE
@@ -137,6 +143,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-8327b923-9e66-9c7c-f85a-7b7d7b9a975e
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 1094
@@ -146,6 +153,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -171,6 +179,7 @@ other_license_detections:
           SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: boost-1.0
+    license_expression_spdx: BSL-1.0
     matches:
       - score: '100.0'
         start_line: 1115
@@ -180,6 +189,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
         rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
@@ -210,6 +220,7 @@ other_license_detections:
           THE SOFTWARE.
     identifier: boost_1_0-0a228323-a725-4239-e66d-7117aa6c54bb
   - license_expression: lgpl-2.0 AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-only AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1140
@@ -219,6 +230,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
         rule_identifier: lgpl-2.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE
@@ -231,6 +243,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_527.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_527.RULE
@@ -247,6 +260,7 @@ other_license_detections:
           the file /usr/share/common-licenses/LGPL-2
     identifier: lgpl_2_0_and_lgpl_2_0_plus-d850005f-fd8c-f752-706d-50cba3d8ab8d
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1152
@@ -256,6 +270,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -268,6 +283,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_526.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_526.RULE
@@ -285,6 +301,7 @@ other_license_detections:
           the file /usr/share/common-licenses/LGPL-2
     identifier: lgpl_2_0_plus-0ae50dc8-108e-6baf-ea93-9f1577dbd2a3
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 1165
@@ -294,6 +311,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -306,6 +324,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_382.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_382.RULE
@@ -322,6 +341,7 @@ other_license_detections:
           the file /usr/share/common-licenses/LGPL-2.1
     identifier: lgpl_2_1-030a1112-24d1-fb89-7789-d08223a7cb41
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 1177
@@ -331,6 +351,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -343,6 +364,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_202.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_202.RULE
@@ -360,6 +382,7 @@ other_license_detections:
           the file /usr/share/common-licenses/LGPL-2.1
     identifier: lgpl_2_1_plus-d08147fa-8e2d-6375-6e8b-9fe0f6ccbfc0
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1190
@@ -369,6 +392,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -381,6 +405,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_655.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_655.RULE
@@ -398,6 +423,7 @@ other_license_detections:
           the file /usr/share/common-licenses/GPL-2
     identifier: gpl_2_0_plus-54c2522e-ad9a-3fb1-7ef4-964ecea834d4
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1203
@@ -407,6 +433,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -419,6 +446,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_508.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_508.RULE
@@ -437,6 +465,7 @@ other_license_detections:
           the file /usr/share/common-licenses/GPL-3
     identifier: gpl_3_0_plus-90de6d88-231e-9b62-39b6-ee5a02b552b4
   - license_expression: x11
+    license_expression_spdx: ICU
     matches:
       - score: '100.0'
         start_line: 1218
@@ -446,6 +475,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11
+        spdx_license_expression: ICU
         rule_identifier: x11.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11.LICENSE
@@ -476,6 +506,7 @@ other_license_detections:
           authorization of the copyright holder.
     identifier: x11-049b28d7-7c22-92c7-882a-48898cec2310
   - license_expression: mpl-1.1
+    license_expression_spdx: MPL-1.1
     matches:
       - score: '100.0'
         start_line: 1243
@@ -485,6 +516,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mpl-1.1
+        spdx_license_expression: MPL-1.1
         rule_identifier: mpl-1.1_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-1.1_24.RULE
@@ -497,6 +529,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mpl-1.1
+        spdx_license_expression: MPL-1.1
         rule_identifier: mpl-1.1.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mpl-1.1.LICENSE
@@ -970,6 +1003,7 @@ other_license_detections:
                Original Code Source Code for Your Modifications.]
     identifier: mpl_1_1-c6b480c1-acd2-503e-ee69-9b4177634444
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 1712
@@ -979,6 +1013,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -991,6 +1026,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1018.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1018.RULE
@@ -999,6 +1035,7 @@ other_license_detections:
           be found in the file `/usr/share/common-licenses/Apache-2.0'.
     identifier: apache_2_0-c372bb88-21db-cccd-47af-f2f5df982469
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 1717
@@ -1008,6 +1045,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -1027,6 +1065,7 @@ other_license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 9
@@ -1036,6 +1075,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE
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 8b11e2b6dd2..d76e05959fb 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
@@ -7,6 +7,7 @@ other_license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 9
@@ -16,6 +17,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -28,6 +30,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_484.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_484.RULE
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 35b2339cfdd..a797e02b482 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
@@ -29,6 +29,7 @@ other_license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception AND GP
 license_detections: []
 other_license_detections:
   - license_expression: ssleay-windows
+    license_expression_spdx: LicenseRef-scancode-ssleay-windows
     matches:
       - score: '100.0'
         start_line: 43
@@ -38,6 +39,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ssleay-windows
+        spdx_license_expression: LicenseRef-scancode-ssleay-windows
         rule_identifier: ssleay-windows_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ssleay-windows_8.RULE
@@ -102,6 +104,7 @@ other_license_detections:
           [including the GNU General Public Licence.]
     identifier: ssleay_windows-93878952-a9e8-1f8d-16e5-daf65078e9d8
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 105
@@ -111,12 +114,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_125.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_125.RULE
         matched_text: 100% Public Domain,
     identifier: public_domain-febd716b-0a50-4cbc-9a5b-36698c14ffd8
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 116
@@ -126,6 +131,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_1.RULE
@@ -143,6 +149,7 @@ other_license_detections:
           without express or implied warranty.
     identifier: mit_old_style_no_advert-19f78f33-dd8b-9688-e8e7-956044c36d07
   - license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0
+    license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception
     matches:
       - score: '100.0'
         start_line: 129
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0
+        spdx_license_expression: GPL-2.0-only WITH x11vnc-openssl-exception
         rule_identifier: gpl-2.0_with_openssl-exception-gpl-2.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_openssl-exception-gpl-2.0_9.RULE
@@ -165,6 +173,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_with_openssl_exception_gpl_2_0-8356e424-817e-5d5b-5bb5-f1c1211c2151
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 137
@@ -174,6 +183,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -186,6 +196,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1151.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1151.RULE
@@ -198,6 +209,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-404c8878-5009-b35f-910c-bb68abd6f353
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 145
@@ -207,6 +219,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -219,6 +232,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_841.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_841.RULE
@@ -232,6 +246,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-835c02fb-84cd-83f2-e14c-b39c13f54dfb
   - license_expression: gpl-1.0-plus
+    license_expression_spdx: GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 154
@@ -241,6 +256,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl_72.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
@@ -253,6 +269,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_465.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_465.RULE
@@ -264,6 +281,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL'.
     identifier: gpl_1_0_plus-14761f06-743f-4cbf-1afa-cea270559e48
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 163
@@ -273,6 +291,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -296,6 +315,7 @@ other_license_detections:
           3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 182
@@ -305,6 +325,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
@@ -337,6 +358,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-1c9f5e21-d1f7-70e3-725e-68240c6ce757
   - license_expression: gpl-1.0-plus AND zlib
+    license_expression_spdx: GPL-1.0-or-later AND Zlib
     matches:
       - score: '100.0'
         start_line: 35
@@ -346,6 +368,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus AND zlib
+        spdx_license_expression: GPL-1.0-or-later AND Zlib
         rule_identifier: gpl-1.0-plus_and_zlib_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_and_zlib_1.RULE
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 c45530a079d..1f3ed374795 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
@@ -8,6 +8,7 @@ other_license_expression_spdx: MIT AND (GPL-2.0-or-later AND GPL-2.0-or-later)
 license_detections: []
 other_license_detections:
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 8
@@ -17,6 +18,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -40,6 +42,7 @@ other_license_detections:
           SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 29
@@ -49,6 +52,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -61,6 +65,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
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 1ced94fb7e0..e5f6ee2cf63 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
@@ -41,6 +43,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
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 373b8c20640..04500a63d3e 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '97.67'
         start_line: 14
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_x11-r75_58.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_x11-r75_58.RULE
@@ -40,6 +42,7 @@ license_detections:
           WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-eaad20d1-a23d-1efa-4faf-fd2acf65e2fa
   - license_expression: amd-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-amd-linux-firmware
     matches:
       - score: '100.0'
         start_line: 38
@@ -49,6 +52,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-amd-linux-firmware
         rule_identifier: amd-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/amd-linux-firmware.LICENSE
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 3f8934f0dac..84220c4fdea 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
@@ -16,6 +16,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: stmicroelectronics-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-stmicro-linux-firmware
     matches:
       - score: '96.74'
         start_line: 12
@@ -25,6 +26,7 @@ license_detections:
         match_coverage: '96.74'
         matcher: 3-seq
         license_expression: stmicroelectronics-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-stmicro-linux-firmware
         rule_identifier: stmicroelectronics-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/stmicroelectronics-linux-firmware.LICENSE
@@ -67,6 +69,8 @@ license_detections:
     identifier: stmicroelectronics_linux_firmware-a130ff63-8589-bdec-7e0a-199e0d3c8cdf
   - license_expression: clear-bsd AND isc AND bsd-no-mod AND gpl-2.0-plus WITH ecos-exception-2.0
       AND mit
+    license_expression_spdx: BSD-3-Clause-Clear AND ISC AND LicenseRef-scancode-bsd-no-mod AND
+      GPL-2.0-or-later WITH eCos-exception-2.0 AND MIT
     matches:
       - score: '99.15'
         start_line: 57
@@ -76,6 +80,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: clear-bsd
+        spdx_license_expression: BSD-3-Clause-Clear
         rule_identifier: clear-bsd_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/clear-bsd_3.RULE
@@ -117,6 +122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
@@ -140,6 +146,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-no-mod
+        spdx_license_expression: LicenseRef-scancode-bsd-no-mod
         rule_identifier: bsd-no-mod.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-no-mod.LICENSE
@@ -182,6 +189,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus WITH ecos-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH eCos-exception-2.0
         rule_identifier: gpl-2.0-plus_with_ecos-exception-2.0_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ecos-exception-2.0_25.RULE
@@ -207,6 +215,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -231,6 +240,7 @@ license_detections:
           SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: clear_bsd_and_isc_and_bsd_no_mod_and_gpl_2_0_plus_with_ecos_exception_2_0_and_mit-d99207f1-72fd-4564-992c-a3c49dd76df1
   - license_expression: qca-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-qca-linux-firmware
     matches:
       - score: '100.0'
         start_line: 205
@@ -240,6 +250,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: qca-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-qca-linux-firmware
         rule_identifier: qca-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qca-linux-firmware.LICENSE
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 3680e1a823b..5cd2e618b4b 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '87.5'
         start_line: 4
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_599.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_599.RULE
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 2b2ec96f31c..597010f84a6 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '87.5'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_599.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_599.RULE
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 585c08d0b63..337f89c4bd3 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: broadcom-proprietary
+    license_expression_spdx: LicenseRef-scancode-broadcom-proprietary
     matches:
       - score: '100.0'
         start_line: 4
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: broadcom-proprietary
+        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
         rule_identifier: broadcom-proprietary_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/broadcom-proprietary_1.RULE
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 4b391a34d54..6cc3085b8e4 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: cavium-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-cavium-linux-firmware
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cavium-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-cavium-linux-firmware
         rule_identifier: cavium-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/cavium-linux-firmware.LICENSE
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 b7d002f1e26..12598c10056 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
@@ -16,6 +16,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '100.0'
         start_line: 11
@@ -25,6 +26,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
@@ -67,6 +69,7 @@ license_detections:
           DAMAGE.
     identifier: intel-ba019b8e-e0ea-8048-9073-a76fbb247ff8
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '95.0'
         start_line: 53
@@ -76,6 +79,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
@@ -119,6 +123,11 @@ license_detections:
   - license_expression: intel AND (bsd-new AND other-permissive AND other-copyleft) AND bsd-new
       AND x11-lucent AND standard-ml-nj AND amd-historical AND sunpro AND hp-1986 AND nilsson-historical
       AND newlib-historical AND bsd-simplified AND x11-hanson AND delorie-historical AND intel-osl-1993
+    license_expression_spdx: LicenseRef-scancode-intel AND (BSD-3-Clause AND LicenseRef-scancode-other-permissive
+      AND LicenseRef-scancode-other-copyleft) AND BSD-3-Clause AND dtoa AND SMLNJ AND LicenseRef-scancode-amd-historical
+      AND SunPro AND HP-1986 AND LicenseRef-scancode-nilsson-historical AND LicenseRef-scancode-newlib-historical
+      AND BSD-2-Clause AND LicenseRef-scancode-x11-hanson AND LicenseRef-scancode-delorie-historical
+      AND LicenseRef-scancode-intel-osl-1993
     matches:
       - score: '95.0'
         start_line: 101
@@ -128,6 +137,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
@@ -175,6 +185,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: license-intro_55.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_55.RULE
@@ -192,6 +203,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_newlib.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_newlib.RULE
@@ -214,6 +226,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_newlib3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_newlib3.RULE
@@ -248,6 +261,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-lucent
+        spdx_license_expression: dtoa
         rule_identifier: x11-lucent.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
@@ -270,6 +284,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: standard-ml-nj
+        spdx_license_expression: SMLNJ
         rule_identifier: standard-ml-nj_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/standard-ml-nj_3.RULE
@@ -300,6 +315,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
@@ -324,6 +340,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -339,6 +356,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -361,6 +379,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
         rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
@@ -381,6 +400,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
         rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
@@ -402,6 +422,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -435,6 +456,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
@@ -459,6 +481,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -497,6 +520,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -529,6 +553,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
@@ -561,6 +586,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -593,6 +619,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
         rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
@@ -615,6 +642,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -647,6 +675,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
@@ -680,6 +709,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: delorie-historical
+        spdx_license_expression: LicenseRef-scancode-delorie-historical
         rule_identifier: delorie-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/delorie-historical.LICENSE
@@ -698,6 +728,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
         rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
@@ -733,6 +764,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -755,6 +787,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -787,6 +820,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -819,6 +853,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -851,6 +886,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_206.RULE
@@ -886,6 +922,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_8.RULE
@@ -918,6 +955,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -950,6 +988,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
@@ -982,6 +1021,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_newlib5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib5.RULE
@@ -1014,6 +1054,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1046,6 +1087,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_183.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_183.RULE
@@ -1080,6 +1122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_412.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_412.RULE
@@ -1118,6 +1161,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_517.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_517.RULE
@@ -1158,6 +1202,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
         rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
@@ -1179,6 +1224,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_979.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_979.RULE
@@ -1212,6 +1258,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_410.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_410.RULE
@@ -1248,6 +1295,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
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 d5454289030..c41d0dc06de 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '95.0'
         start_line: 8
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
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 a79b1d291ec..1253632d403 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 7
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_521.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_521.RULE
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 74a4116cc9c..c3fbf6bf254 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: hauppauge-firmware-oem
+    license_expression_spdx: LicenseRef-scancode-hauppauge-firmware-oem
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hauppauge-firmware-oem
+        spdx_license_expression: LicenseRef-scancode-hauppauge-firmware-oem
         rule_identifier: hauppauge-firmware-oem.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hauppauge-firmware-oem.LICENSE
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 5647df455a8..3c896c0e41f 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '100.0'
         start_line: 7
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
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 d1e69bdd3df..8352d1546b1 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '96.37'
         start_line: 11
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '96.37'
         matcher: 3-seq
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_319.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_319.RULE
@@ -60,6 +62,7 @@ license_detections:
           DAMAGE.
     identifier: proprietary_license-f9aa1a05-7e88-4427-f33a-e480c0221ea3
   - license_expression: marvell-firmware
+    license_expression_spdx: LicenseRef-scancode-marvell-firmware
     matches:
       - score: '100.0'
         start_line: 55
@@ -69,6 +72,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: marvell-firmware
+        spdx_license_expression: LicenseRef-scancode-marvell-firmware
         rule_identifier: marvell-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/marvell-firmware.LICENSE
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 1ced94fb7e0..e5f6ee2cf63 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
@@ -41,6 +43,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
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 1ced94fb7e0..e5f6ee2cf63 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
@@ -41,6 +43,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
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 879f7ceb6de..826e258d14c 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
@@ -56,6 +56,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: 3com-microcode
+    license_expression_spdx: LicenseRef-scancode-3com-microcode
     matches:
       - score: '100.0'
         start_line: 11
@@ -65,6 +66,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: 3com-microcode
+        spdx_license_expression: LicenseRef-scancode-3com-microcode
         rule_identifier: 3com-microcode3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/3com-microcode3.RULE
@@ -99,6 +101,7 @@ license_detections:
           COMBINATION WITH THE 3c990img.h MICROCODE SOFTWARE
     identifier: 3com_microcode-95088184-6248-7170-903e-7cdeb257c3c7
   - license_expression: bsd-simplified-source
+    license_expression_spdx: LicenseRef-scancode-bsd-simplified-source
     matches:
       - score: '100.0'
         start_line: 46
@@ -108,6 +111,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified-source
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
         rule_identifier: bsd-simplified-source.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-source.LICENSE
@@ -118,6 +122,7 @@ license_detections:
           modification.
     identifier: bsd_simplified_source-6143a4b4-ec33-d5c8-8554-6c658178bec4
   - license_expression: agere-bsd
+    license_expression_spdx: LicenseRef-scancode-agere-bsd
     matches:
       - score: '100.0'
         start_line: 56
@@ -127,6 +132,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: agere-bsd
+        spdx_license_expression: LicenseRef-scancode-agere-bsd
         rule_identifier: agere-bsd_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agere-bsd_1.RULE
@@ -170,6 +176,7 @@ license_detections:
           DAMAGE.
     identifier: agere_bsd-4a463b61-1437-6a15-9fe6-40378a9eb65d
   - license_expression: x11-acer
+    license_expression_spdx: LicenseRef-scancode-x11-acer
     matches:
       - score: '100.0'
         start_line: 97
@@ -179,6 +186,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-acer
+        spdx_license_expression: LicenseRef-scancode-x11-acer
         rule_identifier: x11-acer.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-acer.LICENSE
@@ -198,6 +206,7 @@ license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: x11_acer-7550e8f0-db0e-6d89-d2ac-3618d4ee3003
   - license_expression: ctl-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-ctl-linux-firmware
     matches:
       - score: '100.0'
         start_line: 116
@@ -207,6 +216,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ctl-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-ctl-linux-firmware
         rule_identifier: ctl-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ctl-linux-firmware.LICENSE
@@ -257,6 +267,7 @@ license_detections:
           COMBINATION WITH THIS SOFTWARE.
     identifier: ctl_linux_firmware-34c7234e-10ae-8356-1929-6ccd816982c0
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 164
@@ -266,6 +277,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
@@ -275,6 +287,7 @@ license_detections:
           notice is accompanying it.
     identifier: other_permissive-16dc1659-320f-55c9-0ddb-4d46c5526cbb
   - license_expression: linux-openib
+    license_expression_spdx: Linux-OpenIB
     matches:
       - score: '100.0'
         start_line: 173
@@ -284,6 +297,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: linux-openib
+        spdx_license_expression: Linux-OpenIB
         rule_identifier: linux-openib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-openib.LICENSE
@@ -311,6 +325,7 @@ license_detections:
           SOFTWARE.
     identifier: linux_openib-5cc86e85-b634-0fcb-8ddc-4ddbb0522a54
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 200
@@ -320,6 +335,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_334.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_334.RULE
@@ -350,6 +366,7 @@ license_detections:
           USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: proprietary_license-51a2910b-aac5-7aad-3357-77fd6da29d81
   - license_expression: bsd-simplified-source
+    license_expression_spdx: LicenseRef-scancode-bsd-simplified-source
     matches:
       - score: '100.0'
         start_line: 228
@@ -359,6 +376,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified-source
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
         rule_identifier: bsd-simplified-source.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-source.LICENSE
@@ -369,6 +387,7 @@ license_detections:
           modification.
     identifier: bsd_simplified_source-6143a4b4-ec33-d5c8-8554-6c658178bec4
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 236
@@ -378,6 +397,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_332.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_332.RULE
@@ -396,6 +416,7 @@ license_detections:
           OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: proprietary_license-41a38744-1ebf-1a54-f4b8-57cd0cbf62cd
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 252
@@ -405,6 +426,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
@@ -424,6 +446,7 @@ license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-58175475-cc81-cb6a-8921-4daa3f26b3e8
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 269
@@ -433,6 +456,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
@@ -452,6 +476,7 @@ license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-58175475-cc81-cb6a-8921-4daa3f26b3e8
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 286
@@ -461,6 +486,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_331.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_331.RULE
@@ -475,6 +501,7 @@ license_detections:
           of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: proprietary_license-a9e72056-aaa3-7377-e4fe-12479379a931
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 300
@@ -484,6 +511,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_786.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_786.RULE
@@ -514,6 +542,7 @@ license_detections:
           EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-f3e25f19-7c66-228a-349d-cae0cf7fa1fb
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 328
@@ -523,6 +552,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
@@ -541,6 +571,7 @@ license_detections:
           WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-58175475-cc81-cb6a-8921-4daa3f26b3e8
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 344
@@ -550,6 +581,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_330.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_330.RULE
@@ -563,6 +595,7 @@ license_detections:
           of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: proprietary_license-ecce2e4a-d4cf-1dee-1e46-abcca77ae72b
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 355
@@ -572,6 +605,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_328.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_328.RULE
@@ -587,6 +621,7 @@ license_detections:
           PURPOSE AND NON-INFRINGEMENT.
     identifier: proprietary_license-c8f8f417-1187-871b-abf4-44a6b2b46801
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '95.0'
         start_line: 370
@@ -596,6 +631,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
@@ -636,6 +672,7 @@ license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: intel-aad21753-33a8-9b6b-b0be-dbc0838c75ab
   - license_expression: nxp-firmware-patent
+    license_expression_spdx: LicenseRef-scancode-nxp-firmware-patent
     matches:
       - score: '100.0'
         start_line: 414
@@ -645,6 +682,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nxp-firmware-patent
+        spdx_license_expression: LicenseRef-scancode-nxp-firmware-patent
         rule_identifier: nxp-firmware-patent.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nxp-firmware-patent.LICENSE
@@ -695,6 +733,7 @@ license_detections:
           USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: nxp_firmware_patent-7f5723fc-1afa-a9f1-d2f4-056f2efa7eb9
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 462
@@ -704,6 +743,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_44.RULE
@@ -736,6 +776,7 @@ license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_original-4f35e404-7c29-ac7d-6f02-247d42139dd7
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '98.77'
         start_line: 494
@@ -745,6 +786,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_712.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_712.RULE
@@ -768,6 +810,7 @@ license_detections:
           OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-705ac3a8-db0e-b472-c9a5-81aa76c1cd17
   - license_expression: moxa-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-moxa-linux-firmware
     matches:
       - score: '100.0'
         start_line: 515
@@ -777,6 +820,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: moxa-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-moxa-linux-firmware
         rule_identifier: moxa-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/moxa-linux-firmware.LICENSE
@@ -799,6 +843,7 @@ license_detections:
           5. Moxa(r) is worldwide registered trademark.
     identifier: moxa_linux_firmware-fb6f9a99-6e99-6d97-4c1c-881b96f64e03
   - license_expression: ralink-firmware
+    license_expression_spdx: LicenseRef-scancode-ralink-firmware
     matches:
       - score: '100.0'
         start_line: 537
@@ -808,6 +853,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ralink-firmware
+        spdx_license_expression: LicenseRef-scancode-ralink-firmware
         rule_identifier: ralink-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ralink-firmware.LICENSE
@@ -850,6 +896,7 @@ license_detections:
           DAMAGE.
     identifier: ralink_firmware-93a62c8f-7797-e9e8-e61b-edd0e2768be0
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 577
@@ -859,12 +906,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_324.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_324.RULE
         matched_text: All firmware components are redistributable in binary form.
     identifier: proprietary_license-fb7f18e9-048a-60a6-5671-b183fa33d6f6
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 582
@@ -874,6 +923,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_325.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_325.RULE
@@ -1007,6 +1057,7 @@ license_detections:
           writing signed by an authorized officer of NVIDIA.
     identifier: proprietary_license-aac2f5c4-4283-44a0-a2b1-c21fc0892152
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 719
@@ -1016,6 +1067,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_319.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_319.RULE
@@ -1060,6 +1112,7 @@ license_detections:
           DAMAGE.
     identifier: proprietary_license-2c4aae81-5af5-c5c8-6bd9-38a342789964
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 761
@@ -1069,6 +1122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_311.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_311.RULE
@@ -1083,6 +1137,7 @@ license_detections:
           of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: proprietary_license-838f5686-e3d0-2c33-daf1-28caf52e0dc9
   - license_expression: ralink-firmware
+    license_expression_spdx: LicenseRef-scancode-ralink-firmware
     matches:
       - score: '100.0'
         start_line: 775
@@ -1092,6 +1147,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ralink-firmware
+        spdx_license_expression: LicenseRef-scancode-ralink-firmware
         rule_identifier: ralink-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ralink-firmware.LICENSE
@@ -1134,6 +1190,7 @@ license_detections:
           DAMAGE.
     identifier: ralink_firmware-93a62c8f-7797-e9e8-e61b-edd0e2768be0
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 815
@@ -1143,6 +1200,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
@@ -1152,6 +1210,7 @@ license_detections:
           notice is accompanying it.
     identifier: other_permissive-16dc1659-320f-55c9-0ddb-4d46c5526cbb
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 822
@@ -1161,6 +1220,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
@@ -1170,6 +1230,7 @@ license_detections:
           notice is accompanying it.
     identifier: other_permissive-16dc1659-320f-55c9-0ddb-4d46c5526cbb
   - license_expression: bsd-new AND proprietary-license
+    license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 829
@@ -1179,6 +1240,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new AND proprietary-license
+        spdx_license_expression: BSD-3-Clause AND LicenseRef-scancode-proprietary-license
         rule_identifier: bsd-new_and_proprietary-license_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE
@@ -1218,6 +1280,7 @@ license_detections:
           EITHER SOLELY OR IN COMBINATION WITH THIS SOFTWARE.
     identifier: bsd_new_and_proprietary_license-c9674145-0129-79f6-f4e9-f55158e8b2ea
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 865
@@ -1227,6 +1290,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_308.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_308.RULE
@@ -1240,6 +1304,7 @@ license_detections:
           of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: proprietary_license-1be66554-dd2d-def0-56ec-6b64fe8eeadd
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '100.0'
         start_line: 876
@@ -1249,6 +1314,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
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 51f0d37b4d7..85257bc647c 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-source-code
+    license_expression_spdx: BSD-Source-Code
     matches:
       - score: '99.46'
         start_line: 7
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-source-code
+        spdx_license_expression: BSD-Source-Code
         rule_identifier: bsd-source-code_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-source-code_8.RULE
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 846d7015432..e531afa2a72 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: netronome-firmware
+    license_expression_spdx: LicenseRef-scancode-netronome-firmware
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: netronome-firmware
+        spdx_license_expression: LicenseRef-scancode-netronome-firmware
         rule_identifier: netronome-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/netronome-firmware.LICENSE
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 c8cdfb9ab59..38d3bec9242 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: qlogic-firmware
+    license_expression_spdx: LicenseRef-scancode-qlogic-firmware
     matches:
       - score: '100.0'
         start_line: 7
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: qlogic-firmware
+        spdx_license_expression: LicenseRef-scancode-qlogic-firmware
         rule_identifier: qlogic-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qlogic-firmware.LICENSE
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 2ca683a2768..4cda58a368e 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
@@ -14,6 +14,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: qti-linux-firmware
+    license_expression_spdx: LicenseRef-scancode-qti-linux-firmware
     matches:
       - score: '100.0'
         start_line: 6
@@ -23,6 +24,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: qti-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-qti-linux-firmware
         rule_identifier: qti-linux-firmware.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qti-linux-firmware.LICENSE
@@ -235,6 +237,7 @@ license_detections:
           in English.
     identifier: qti_linux_firmware-8701f5f2-a72d-3e30-4c18-4411e2990f20
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '44.44'
         start_line: 231
@@ -244,6 +247,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_557.RULE
         rule_relevance: 50
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_557.RULE
@@ -254,6 +258,7 @@ license_detections:
           trademarks of their respective owners.
     identifier: proprietary_license-39b63884-7ff2-74b4-3a45-5a2b9738007e
   - license_expression: openssl-ssleay
+    license_expression_spdx: OpenSSL
     matches:
       - score: '100.0'
         start_line: 240
@@ -263,6 +268,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
         rule_identifier: openssl-ssleay_43.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE
@@ -280,12 +286,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
         rule_identifier: openssl-ssleay_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE
         matched_text: OpenSSL License
     identifier: openssl_ssleay-cbfdb9fc-932d-b226-10aa-6aeea27f1ff9
   - license_expression: openssl
+    license_expression_spdx: LicenseRef-scancode-openssl
     matches:
       - score: '100.0'
         start_line: 252
@@ -295,6 +303,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openssl
+        spdx_license_expression: LicenseRef-scancode-openssl
         rule_identifier: openssl_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE
@@ -349,6 +358,7 @@ license_detections:
            * Hudson (tjh@cryptsoft.com).
     identifier: openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621
   - license_expression: ssleay-windows
+    license_expression_spdx: LicenseRef-scancode-ssleay-windows
     matches:
       - score: '100.0'
         start_line: 309
@@ -358,6 +368,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ssleay-windows
+        spdx_license_expression: LicenseRef-scancode-ssleay-windows
         rule_identifier: ssleay-windows.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE
@@ -416,6 +427,7 @@ license_detections:
            * [including the GNU Public Licence.]
     identifier: ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 371
@@ -425,12 +437,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE
         matched_text: For conditions of distribution and use, see copyright notice in zlib.h
     identifier: zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 380
@@ -440,6 +454,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
@@ -463,6 +478,7 @@ license_detections:
             jloup@gzip.org          madler@alumni.caltech.edu
     identifier: zlib-b04102d0-a663-78b5-de18-9677ee48ce9c
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 413
@@ -472,6 +488,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_303.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
@@ -481,6 +498,7 @@ license_detections:
            * This code is in the public domain; do with it what you wish.
     identifier: public_domain-12604376-43c0-ec4b-0941-067570a4db40
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 439
@@ -490,6 +508,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_68.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_68.RULE
@@ -519,6 +538,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-50d3a78f-7a51-9673-b9f5-74ef398f2d8a
   - license_expression: gary-s-brown
+    license_expression_spdx: LicenseRef-scancode-gary-s-brown
     matches:
       - score: '100.0'
         start_line: 469
@@ -528,6 +548,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gary-s-brown
+        spdx_license_expression: LicenseRef-scancode-gary-s-brown
         rule_identifier: gary-s-brown.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gary-s-brown.LICENSE
@@ -536,6 +557,7 @@ license_detections:
            *  code or tables extracted from it, as desired without restriction.
     identifier: gary_s_brown-00cc5fb9-1775-705c-7cef-d16939c33621
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 514
@@ -545,6 +567,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_105.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_105.RULE
@@ -557,6 +580,7 @@ license_detections:
              about the use to which it is being put.
     identifier: other_permissive-5ebac279-7f15-6158-1df3-0e743aaf1c03
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 531
@@ -566,6 +590,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_70.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_70.RULE
@@ -581,6 +606,7 @@ license_detections:
            * PERFORMANCE OF THIS SOFTWARE.
     identifier: public_domain_disclaimer-fa151bee-d99d-f52f-7925-7ae1521f383d
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 549
@@ -590,6 +616,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_67.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_67.RULE
@@ -612,6 +639,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: public_domain_disclaimer-304a8b05-ebaa-92f9-0e58-56b7d2029950
   - license_expression: gpl-2.0 OR bsd-new
+    license_expression_spdx: GPL-2.0-only OR BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 580
@@ -621,6 +649,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0 OR bsd-new
+        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
         rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE
@@ -635,6 +664,7 @@ license_detections:
            * See README and COPYING for more details.
     identifier: gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9
   - license_expression: gpl-2.0 OR bsd-new
+    license_expression_spdx: GPL-2.0-only OR BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 594
@@ -644,6 +674,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0 OR bsd-new
+        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
         rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE
@@ -658,6 +689,7 @@ license_detections:
            * See README and COPYING for more details.
     identifier: gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 613
@@ -667,6 +699,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1040.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1040.RULE
@@ -696,6 +729,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-debd6b28-1beb-61ff-558f-6ce629c42bd4
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 646
@@ -705,6 +739,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1209.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1209.RULE
@@ -734,6 +769,7 @@ license_detections:
           * SUCH DAMAGE.
     identifier: bsd_new-79cb4d03-8935-6bd7-7fdf-7c3d7bb6581f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 677
@@ -743,6 +779,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
@@ -770,6 +807,7 @@ license_detections:
            * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-8253b828-e3cb-c484-e1ba-cfca208b3bf2
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 705
@@ -779,6 +817,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
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 73b5bf8bcab..22649f92dd2 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
@@ -13,6 +13,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 9
@@ -22,6 +23,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1070.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1070.RULE
@@ -48,6 +50,7 @@ license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-3fdabc09-7d33-9955-9b42-64e45eab4535
   - license_expression: linux-openib
+    license_expression_spdx: Linux-OpenIB
     matches:
       - score: '100.0'
         start_line: 35
@@ -57,6 +60,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: linux-openib
+        spdx_license_expression: Linux-OpenIB
         rule_identifier: linux-openib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-openib.LICENSE
@@ -84,6 +88,7 @@ license_detections:
           SOFTWARE.
     identifier: linux_openib-5cc86e85-b634-0fcb-8ddc-4ddbb0522a54
   - license_expression: qlogic-microcode
+    license_expression_spdx: LicenseRef-scancode-qlogic-microcode
     matches:
       - score: '100.0'
         start_line: 61
@@ -93,6 +98,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: qlogic-microcode
+        spdx_license_expression: LicenseRef-scancode-qlogic-microcode
         rule_identifier: qlogic-microcode.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qlogic-microcode.LICENSE
@@ -135,6 +141,7 @@ license_detections:
           COMBINATION WITH THIS PROGRAM.
     identifier: qlogic_microcode-dc001f04-531b-99f7-2248-d734ca5030f2
   - license_expression: other-permissive AND proprietary-license
+    license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 102
@@ -144,6 +151,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
@@ -159,6 +167,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_310.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_310.RULE
@@ -172,6 +181,7 @@ license_detections:
           of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: other_permissive_and_proprietary_license-697a2b44-6955-8abd-ac33-75afd7dab11e
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 117
@@ -181,6 +191,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
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 1ced94fb7e0..e5f6ee2cf63 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
@@ -41,6 +43,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
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 0ecd7057ef7..882ec3ab355 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 9
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
@@ -25,6 +27,7 @@ license_detections:
           notice is accompanying it.
     identifier: other_permissive-16dc1659-320f-55c9-0ddb-4d46c5526cbb
   - license_expression: intel
+    license_expression_spdx: LicenseRef-scancode-intel
     matches:
       - score: '93.72'
         start_line: 18
@@ -34,6 +37,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
         rule_identifier: intel_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_1.RULE
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 3947d6cd827..5f2860e66e9 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_307.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_307.RULE
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 1ee1792df41..7313b89469f 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '97.98'
         start_line: 9
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1006.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1006.RULE
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 2e7458472af..92309d7d377 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 9
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_556.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_556.RULE
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 59d49376f64..9043db0c033 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mongodb-sspl-1.0
+    license_expression_spdx: SSPL-1.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
         rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
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 59d49376f64..9043db0c033 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mongodb-sspl-1.0
+    license_expression_spdx: SSPL-1.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
         rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
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 59d49376f64..9043db0c033 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mongodb-sspl-1.0
+    license_expression_spdx: SSPL-1.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
         rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
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 59d49376f64..9043db0c033 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mongodb-sspl-1.0
+    license_expression_spdx: SSPL-1.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
         rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
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 59d49376f64..9043db0c033 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mongodb-sspl-1.0
+    license_expression_spdx: SSPL-1.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
         rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
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 b9f33eb27fc..419f003a203 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
@@ -10,6 +10,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 21
@@ -19,6 +20,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_600.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_600.RULE
@@ -50,6 +52,7 @@ license_detections:
           DAMAGE.
     identifier: proprietary_license-f62990af-76c7-140e-c98a-c964711a4db6
   - license_expression: broadcom-proprietary
+    license_expression_spdx: LicenseRef-scancode-broadcom-proprietary
     matches:
       - score: '100.0'
         start_line: 51
@@ -59,6 +62,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: broadcom-proprietary
+        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
         rule_identifier: broadcom-proprietary_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/broadcom-proprietary_1.RULE
@@ -204,6 +208,7 @@ license_detections:
           \ of the parties in\nwriting."
     identifier: broadcom_proprietary-8e7d81ee-b774-62b0-887f-2a2771ec256f
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 260
@@ -213,6 +218,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -225,6 +231,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
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 5ba33ca9bd3..a93688768e4 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 42
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
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 d18929be99d..55e90686ce3 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 28
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_811.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_811.RULE
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 8b83319e3a4..064f65324a7 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 4
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_374.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE
@@ -26,6 +28,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_736.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_736.RULE
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 8dcfb3056cd..e29ed30d5dc 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 17
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_862.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_862.RULE
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 22f7d10b500..922a574fddd 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
@@ -11,6 +11,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND LicenseRef-sc
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 23
@@ -20,6 +21,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -32,6 +34,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1188.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1188.RULE
@@ -40,6 +43,7 @@ other_license_detections:
           License version 2 is available in /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0-3c00a491-4933-3121-b9bf-74ca28cddcfe
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '99.0'
         start_line: 13
@@ -49,6 +53,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
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 986a6ca062b..f398d885884 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
@@ -10,6 +10,8 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus AND bash-exception-gpl AND gpl-1.0-plus
+    license_expression_spdx: GPL-3.0-or-later AND LicenseRef-scancode-bash-exception-gpl-2.0
+      AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 13
@@ -19,6 +21,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_289.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_289.RULE
@@ -45,6 +48,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bash-exception-gpl
+        spdx_license_expression: LicenseRef-scancode-bash-exception-gpl-2.0
         rule_identifier: bash-exception-gpl.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bash-exception-gpl.LICENSE
@@ -64,12 +68,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl_72.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
         matched_text: License GPL
     identifier: gpl_3_0_plus_and_bash_exception_gpl_and_gpl_1_0_plus-97ecff07-b029-2b9f-7d04-2b0e02ccce04
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 44
@@ -79,6 +85,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_207.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_207.RULE
@@ -90,6 +97,7 @@ license_detections:
            contents of this document remain unaltered.
     identifier: other_permissive-60c74a7c-6092-8de0-c193-49a4fe912e05
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 55
@@ -99,6 +107,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_22.RULE
@@ -115,6 +124,7 @@ license_detections:
            ``GNU Free Documentation License''.
     identifier: gfdl_1_3_plus-0aeecc5a-f102-1cd4-f9a4-21a9fa22ea82
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 71
@@ -124,6 +134,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
@@ -136,6 +147,7 @@ license_detections:
            ``GNU Free Documentation License''.
     identifier: gfdl_1_3_plus-07dd7e9d-9df0-a5d7-2970-ca1db4485238
   - license_expression: other-permissive AND latex2e
+    license_expression_spdx: LicenseRef-scancode-other-permissive AND Latex2e
     matches:
       - score: '100.0'
         start_line: 82
@@ -145,6 +157,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_206.RULE
@@ -160,6 +173,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: latex2e
+        spdx_license_expression: Latex2e
         rule_identifier: latex2e_7.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_7.RULE
@@ -180,6 +194,7 @@ license_detections:
            by the Foundation.
     identifier: other_permissive_and_latex2e-9bfec26a-a076-0444-9a14-c06a5cb3d5c9
   - license_expression: latex2e
+    license_expression_spdx: Latex2e
     matches:
       - score: '99.0'
         start_line: 108
@@ -189,6 +204,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: latex2e
+        spdx_license_expression: Latex2e
         rule_identifier: latex2e_3.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_3.RULE
@@ -212,6 +228,7 @@ license_detections:
            into another language, under the above conditions for modified versions.
     identifier: latex2e-abecc49a-960b-cb0b-20f3-1234574e4447
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 132
@@ -221,6 +238,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
@@ -233,6 +251,7 @@ license_detections:
            ``GNU Free Documentation License''.
     identifier: gfdl_1_3_plus-07dd7e9d-9df0-a5d7-2970-ca1db4485238
   - license_expression: latex2e
+    license_expression_spdx: Latex2e
     matches:
       - score: '99.0'
         start_line: 144
@@ -242,6 +261,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: latex2e
+        spdx_license_expression: Latex2e
         rule_identifier: latex2e_2.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_2.RULE
@@ -265,6 +285,7 @@ license_detections:
            into another language, under the above conditions for modified versions.
     identifier: latex2e-6a890414-92fd-9f22-de3c-b47764d7b84e
   - license_expression: bsd-original-uc AND historical
+    license_expression_spdx: BSD-4-Clause-UC AND HPND
     matches:
       - score: '100.0'
         start_line: 168
@@ -274,6 +295,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -313,6 +335,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: historical
+        spdx_license_expression: HPND
         rule_identifier: historical_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
@@ -334,6 +357,7 @@ license_detections:
            * SOFTWARE.
     identifier: bsd_original_uc_and_historical-f1b25d95-5587-016c-88d1-a85a2079ce8f
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 220
@@ -343,6 +367,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_291.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_291.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 419c528ac2c..444c48f119f 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
@@ -9,6 +9,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '81.1'
         start_line: 22
@@ -18,6 +19,7 @@ license_detections:
         match_coverage: '81.1'
         matcher: 3-seq
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_487.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_487.RULE
@@ -44,6 +46,7 @@ license_detections:
              along with this program.  If not, see .  */
     identifier: gpl_3_0_plus-58ef5a2f-7e40-62ff-7783-d9d46c47ccfd
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 47
@@ -53,6 +56,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -82,6 +86,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 78
@@ -91,6 +96,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -109,6 +115,7 @@ license_detections:
              along with this program.  If not, see .  */
     identifier: gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 95
@@ -118,6 +125,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -147,6 +155,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 126
@@ -156,6 +165,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -174,6 +184,7 @@ license_detections:
              along with this program.  If not, see .
     identifier: gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 145
@@ -183,6 +194,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_4.RULE
@@ -202,6 +214,7 @@ license_detections:
              Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
     identifier: gpl_3_0_plus-3bfa9c99-47df-a325-9340-4a339cab8cf7
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 162
@@ -211,6 +224,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -229,6 +243,7 @@ license_detections:
            * SOFTWARE.
     identifier: isc-fbf6f8d8-a949-0427-62b2-aef52fe84e71
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 180
@@ -238,6 +253,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -247,6 +263,7 @@ license_detections:
           dnl with or without modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-8da7bfd8-1c00-9b33-a4c5-6170a19ffb0f
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '75.18'
         start_line: '193'
@@ -256,6 +273,7 @@ license_detections:
         match_coverage: '75.18'
         matcher: 3-seq
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_286.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_286.RULE
@@ -290,6 +308,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -308,6 +327,7 @@ license_detections:
              along with this program.  If not, see .  */
     identifier: gpl_3_0_plus-0da3ef65-99de-5ae9-77c7-870876e764cf
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 233
@@ -317,6 +337,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -335,6 +356,7 @@ license_detections:
              along with this program.  If not, see .  */
     identifier: gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 253
@@ -344,6 +366,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
@@ -362,6 +385,7 @@ license_detections:
              along with this program.  If not, see .
     identifier: gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f
   - license_expression: gfdl-1.2-plus
+    license_expression_spdx: GFDL-1.2-or-later
     matches:
       - score: '100.0'
         start_line: 272
@@ -371,6 +395,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
         rule_identifier: gfdl-1.2-plus.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2-plus.RULE
@@ -383,6 +408,7 @@ license_detections:
           Free Documentation License''.
     identifier: gfdl_1_2_plus-861db719-73be-b056-b95c-1a4494feed0b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 285
@@ -392,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_2.RULE
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 f3043fd060d..991541b5da5 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
@@ -47,6 +47,7 @@ other_license_expression_spdx: BSD-3-Clause AND FSFULLRWD AND FSFULLRWD AND FSFU
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 155
@@ -56,6 +57,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -85,6 +87,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 180
@@ -94,6 +97,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
@@ -102,6 +106,7 @@ other_license_detections:
           gives unlimited permission to copy, distribute and modify it.
     identifier: fsf_free-95bff5c5-ed9b-1c78-0dd8-4c05168176ba
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 184
@@ -111,6 +116,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
@@ -125,6 +131,7 @@ other_license_detections:
           PARTICULAR PURPOSE.
     identifier: fsf_unlimited_no_warranty-0823c9f0-6e4b-8cf0-64e1-5165a09dfa45
   - license_expression: x11-xconsortium AND public-domain
+    license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: '194'
@@ -134,6 +141,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -167,12 +175,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_58.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-85b6bf80-9de9-fe71-fa83-14be44f52a4b
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 218
@@ -182,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -194,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -216,6 +228,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '99.0'
         start_line: 138
@@ -225,6 +238,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
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 435d1375f77..7e4f2320dbe 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
@@ -22,6 +22,7 @@ other_license_expression_spdx: BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AN
 license_detections: []
 other_license_detections:
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '99.45'
         start_line: 59
@@ -31,6 +32,7 @@ other_license_detections:
         match_coverage: '99.45'
         matcher: 3-seq
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_52.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_52.RULE
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 2445e3f05df..f966eba882d 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '90.0'
         start_line: 6
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_306.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_306.RULE
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 b4a13068553..287b73fa1cc 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus AND public-domain
+    license_expression_spdx: GPL-2.0-or-later AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 8
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus AND public-domain
+        spdx_license_expression: GPL-2.0-or-later AND LicenseRef-scancode-public-domain
         rule_identifier: gpl-2.0-plus_and_public-domain_810.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_public-domain_810.RULE
@@ -25,6 +27,7 @@ license_detections:
           which is in the public domain.
     identifier: gpl_2_0_plus_and_public_domain-e8510ebe-e9a6-c0d1-ae7e-42280922b32a
   - license_expression: smail-gpl
+    license_expression_spdx: LicenseRef-scancode-smail-gpl
     matches:
       - score: '100.0'
         start_line: 18
@@ -34,6 +37,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: smail-gpl
+        spdx_license_expression: LicenseRef-scancode-smail-gpl
         rule_identifier: smail-gpl.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/smail-gpl.LICENSE
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 15a8c790cb6..fd2adf18f1b 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 18
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_234.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_234.RULE
@@ -32,6 +34,7 @@ license_detections:
           may be found in `/usr/share/common-licenses/GPL'.
     identifier: gpl_3_0_plus-5534b6bc-4eef-713f-94c7-caa583171b85
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 38
@@ -41,6 +44,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_3.RULE
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 05049c67bad..e939ffdee53 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
@@ -21,6 +21,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: public-domain AND other-permissive
+    license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive
     matches:
       - score: '70.0'
         start_line: 102
@@ -30,6 +31,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
@@ -42,6 +44,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_277.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_277.RULE
@@ -56,6 +59,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_346.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_346.RULE
@@ -68,6 +72,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_348.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_348.RULE
@@ -82,12 +87,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_347.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_347.RULE
         matched_text: placed in public domain as well.
     identifier: public_domain_and_other_permissive-6d37fe29-1db1-5e5f-a49b-c1130b99e1cd
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 118
@@ -97,6 +104,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_303.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
@@ -106,6 +114,7 @@ other_license_detections:
           This code is in the public domain; do with it what you wish.
     identifier: public_domain-12604376-43c0-ec4b-0941-067570a4db40
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 127
@@ -115,6 +124,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -127,6 +137,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
@@ -151,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1299.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1299.RULE
@@ -160,6 +172,7 @@ other_license_detections:
           as the file ‘COPYING’.
     identifier: gpl_2_0_plus_and_gpl_2_0-5a6543fd-26b8-dd6a-e1e9-6425e51ff1a5
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 145
@@ -169,6 +182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -181,6 +195,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1119.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1119.RULE
@@ -198,6 +213,7 @@ other_license_detections:
           along with this program.  If not, see .
     identifier: gpl_2_0-a054018a-dccf-8b92-9ab1-ab255ec3aba9
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '99.45'
         start_line: 159
@@ -207,6 +223,7 @@ other_license_detections:
         match_coverage: '99.45'
         matcher: 3-seq
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_52.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_52.RULE
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 2783592c4b5..dd8da3c19f6 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
+    license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
       - score: '99.02'
         start_line: 17
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '99.02'
         matcher: 3-seq
         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
         rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
@@ -30,6 +32,7 @@ license_detections:
           \  The\ncomplete text of the GNU Library General Public License can be found\nin '/usr/share/common-licenses/LGPL-2'."
     identifier: gpl_2_0_and_lgpl_2_0_and_bsd_new_and_mit_old_style_no_advert-aed55561-0504-0265-5986-832cc7f7bbf2
   - license_expression: ntp-0 AND bsd-new
+    license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 38
@@ -39,6 +42,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ntp-0
+        spdx_license_expression: NTP-0
         rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
@@ -59,6 +63,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 51a79618474..aaadd2a4e1f 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.3-plus
+    license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later
     matches:
       - score: '87.25'
         start_line: 49
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '87.25'
         matcher: 3-seq
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_410.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_410.RULE
@@ -51,6 +53,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_6.RULE
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 c4b4c21a667..532a82e57a7 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
@@ -40,6 +40,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 83
@@ -49,6 +50,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
@@ -78,6 +80,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
@@ -87,6 +90,7 @@ license_detections:
           Runtime Library Exception (included in this file):
     identifier: gpl_3_0_plus_with_gcc_exception_3_1-515ad309-fd9b-9f8d-bb86-8c7089f7f67a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 123
@@ -96,6 +100,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -118,6 +123,7 @@ license_detections:
           \ THIS SOFTWARE, EVEN IF ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE."
     identifier: bsd_new-ddbdf2af-d93f-9912-6c83-1167bb9d3f80
   - license_expression: uoi-ncsa AND mit
+    license_expression_spdx: NCSA AND MIT
     matches:
       - score: '100.0'
         start_line: 167
@@ -127,6 +133,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: uoi-ncsa
+        spdx_license_expression: NCSA
         rule_identifier: uoi-ncsa_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/uoi-ncsa_9.RULE
@@ -165,6 +172,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -188,6 +196,7 @@ license_detections:
           THE SOFTWARE.
     identifier: uoi_ncsa_and_mit-665f4b33-de00-67e2-f39e-c4aeed276c1e
   - license_expression: mit AND gfdl-1.2 AND gcc-exception-3.1
+    license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 217
@@ -197,6 +206,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1083.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1083.RULE
@@ -227,6 +237,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.2
+        spdx_license_expression: GFDL-1.2-only
         rule_identifier: gfdl-1.2_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2_7.RULE
@@ -242,6 +253,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gcc-exception-3.1
+        spdx_license_expression: GCC-exception-3.1
         rule_identifier: gcc-exception-3.1.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gcc-exception-3.1.LICENSE
@@ -320,6 +332,7 @@ license_detections:
           requirements of the license of GCC.
     identifier: mit_and_gfdl_1_2_and_gcc_exception_3_1-52d926fc-e7f5-999e-1780-6dd7bd70cd6f
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 322
@@ -329,6 +342,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_469.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_469.RULE
@@ -345,6 +359,7 @@ license_detections:
           Library General Public License for more details.
     identifier: lgpl_2_0_plus-35d0fb1e-679a-92c4-4ed4-ba6282419c63
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 338
@@ -354,6 +369,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -369,6 +385,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 356
@@ -378,6 +395,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -393,6 +411,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 374
@@ -402,6 +421,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
@@ -417,6 +437,7 @@ license_detections:
              Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-1e9ed5fb-59c8-38f4-3025-8ef27ff4bcb2
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '70.0'
         start_line: 387
@@ -426,12 +447,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain.
     identifier: public_domain-3dd945ae-65df-7d90-6467-60f8ecf2eb77
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 395
@@ -441,6 +464,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
@@ -456,6 +480,7 @@ license_detections:
              Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-1e9ed5fb-59c8-38f4-3025-8ef27ff4bcb2
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 410
@@ -465,6 +490,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -480,6 +506,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 424
@@ -489,6 +516,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -499,6 +527,7 @@ license_detections:
            * is preserved.
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 434
@@ -508,6 +537,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
@@ -539,6 +569,7 @@ license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 473
@@ -548,6 +579,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_812.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_812.RULE
@@ -562,6 +594,7 @@ license_detections:
           license in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-61a2eca6-5026-e856-1a3d-dd46fc4ec497
   - license_expression: artistic-perl-1.0 OR gpl-1.0
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only
     matches:
       - score: '100.0'
         start_line: 490
@@ -571,6 +604,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
         rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0_2.RULE
@@ -583,6 +617,7 @@ license_detections:
           license in `/usr/share/common-licenses/Artistic'.
     identifier: artistic_perl_1_0_or_gpl_1_0-3595a871-9965-7e70-31ab-7b75ec03f7f3
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 503
@@ -592,6 +627,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -613,6 +649,7 @@ license_detections:
             3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: d-zlib
+    license_expression_spdx: LicenseRef-scancode-d-zlib
     matches:
       - score: '100.0'
         start_line: 529
@@ -622,6 +659,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: d-zlib
+        spdx_license_expression: LicenseRef-scancode-d-zlib
         rule_identifier: d-zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/d-zlib.LICENSE
@@ -645,6 +683,7 @@ license_detections:
               distribution.
     identifier: d_zlib-b5366170-a1b8-db31-98f3-558ace6d8893
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 557
@@ -654,6 +693,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -678,6 +718,7 @@ license_detections:
              USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 581
@@ -687,6 +728,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
@@ -711,6 +753,7 @@ license_detections:
              .
     identifier: gpl_3_0_plus_with_gcc_exception_3_1-1400acf6-c9c6-a16e-dd05-a6cc5929f4d8
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 609
@@ -720,6 +763,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -735,6 +779,7 @@ license_detections:
           General Public License for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 623
@@ -744,6 +789,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_4.RULE
@@ -754,6 +800,8 @@ license_detections:
           Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
     identifier: gfdl_1_3_plus-df889bb7-d78d-afbe-a993-9f7165b10997
   - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1 AND gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WITH
+      GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 635
@@ -763,6 +811,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
+        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
         rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
@@ -788,6 +837,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_41.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_41.RULE
@@ -797,6 +847,9 @@ license_detections:
     identifier: lgpl_2_1_plus_with_gcc_exception_3_1_and_gpl_3_0_plus_with_gcc_exception_3_1-a992f3a6-bd11-41fc-1f29-aa01c5643b2f
   - license_expression: (gpl-3.0 AND lgpl-2.1 AND lgpl-3.0) AND (lgpl-2.0 AND gpl-3.0) AND gpl-3.0-plus
       AND gnu-emacs-gpl-1988 AND (gpl-3.0 AND lgpl-2.1) AND (gpl-2.0-plus AND gpl-3.0-plus)
+    license_expression_spdx: (GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only) AND (LGPL-2.0-only
+      AND GPL-3.0-only) AND GPL-3.0-or-later AND LicenseRef-scancode-gnu-emacs-gpl-1988 AND
+      (GPL-3.0-only AND LGPL-2.1-only) AND (GPL-2.0-or-later AND GPL-3.0-or-later)
     matches:
       - score: '100.0'
         start_line: 663
@@ -806,6 +859,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
         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
@@ -818,6 +872,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
         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
@@ -830,6 +885,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0 AND gpl-3.0
+        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
         rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_gpl-3.0_1.RULE
@@ -842,6 +898,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_89.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE
@@ -854,6 +911,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gnu-emacs-gpl-1988
+        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
         rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gnu-emacs-gpl-1988_1.RULE
@@ -873,6 +931,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
         rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_2.RULE
@@ -885,12 +944,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         matched_text: Mix of GPL-2+ and GPL-3+
     identifier: gpl_3_0_and_lgpl_2_1_and_lgpl_3_0__and__lgpl_2_0_and_gpl_3_0__and_gpl_3_0_plus_and_gnu_emacs_gpl_1988_and__gpl_3_0_and_lgpl_2_1__and__gpl_2_0_plus_and_gpl_3_0_plus-d1c41ede-85ab-f71e-acff-90e3585e0615
   - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
+    license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 701
@@ -900,6 +961,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
+        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
         rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
@@ -919,6 +981,7 @@ license_detections:
           3.1, as published by the Free Software Foundation.
     identifier: lgpl_2_1_plus_with_gcc_exception_3_1-90c78958-a68e-4d1f-f2be-cdbe3641ea93
   - license_expression: lgpl-2.0-plus AND gpl-1.0-plus
+    license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 739
@@ -928,6 +991,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
@@ -941,6 +1005,7 @@ license_detections:
           license be found in /usr/share/common-licenses/LGPL.
     identifier: lgpl_2_0_plus_and_gpl_1_0_plus-ea6120ce-febd-518c-1a96-ebf5ad359b44
   - license_expression: bsla-no-advert
+    license_expression_spdx: LicenseRef-scancode-bsla-no-advert
     matches:
       - score: '100.0'
         start_line: 754
@@ -950,6 +1015,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsla-no-advert
+        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
         rule_identifier: bsla-no-advert.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla-no-advert.LICENSE
@@ -964,6 +1030,7 @@ license_detections:
           \ PARTICULAR PURPOSE."
     identifier: bsla_no_advert-57978d98-817a-ef5a-43bc-8507eaddaf43
   - license_expression: bsla
+    license_expression_spdx: BSD-4.3TAHOE
     matches:
       - score: '100.0'
         start_line: 771
@@ -973,6 +1040,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
         rule_identifier: bsla.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla.LICENSE
@@ -990,6 +1058,7 @@ license_detections:
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: bsla-f5e6e752-5580-dedf-4978-65f27db044cc
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 789
@@ -999,6 +1068,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1032,6 +1102,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 822
@@ -1041,6 +1112,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -1070,6 +1142,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 856
@@ -1079,6 +1152,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1112,6 +1186,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: flex-2.5
+    license_expression_spdx: BSD-3-Clause-flex
     matches:
       - score: '100.0'
         start_line: 889
@@ -1121,6 +1196,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
         rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
@@ -1140,6 +1216,7 @@ license_detections:
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: flex_2_5-dc2b38a4-d8d9-e49a-8c97-65694300b4be
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 909
@@ -1149,6 +1226,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc.RULE
@@ -1156,6 +1234,8 @@ license_detections:
     identifier: bsd_original_uc-3028f908-0199-4878-9644-da1c6c536067
   - 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
+    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
     matches:
       - score: '100.0'
         start_line: 919
@@ -1166,6 +1246,8 @@ license_detections:
         matcher: 2-aho
         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
+          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
         rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
@@ -1175,6 +1257,7 @@ license_detections:
           details.
     identifier: 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-97e72829-8548-5a17-f1ec-868edb9679fc
   - license_expression: x11-lucent
+    license_expression_spdx: dtoa
     matches:
       - score: '100.0'
         start_line: 929
@@ -1184,6 +1267,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-lucent
+        spdx_license_expression: dtoa
         rule_identifier: x11-lucent.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
@@ -1200,6 +1284,7 @@ license_detections:
           OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
     identifier: x11_lucent-0e33f797-24ab-9665-2d4b-10a0ff4d546d
   - license_expression: amd-historical
+    license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
       - score: '100.0'
         start_line: 944
@@ -1209,6 +1294,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
@@ -1227,6 +1313,7 @@ license_detections:
           or  suggestions about this software
     identifier: amd_historical-2ce3eef6-3c42-bf88-a157-854440a529af
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 983
@@ -1236,6 +1323,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -1244,6 +1332,7 @@ license_detections:
           \ this notice \nis preserved."
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: hp-1986
+    license_expression_spdx: HP-1986
     matches:
       - score: '100.0'
         start_line: 992
@@ -1253,6 +1342,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -1269,6 +1359,7 @@ license_detections:
           suitability of this software for any purpose.
     identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d
   - license_expression: nilsson-historical
+    license_expression_spdx: LicenseRef-scancode-nilsson-historical
     matches:
       - score: '100.0'
         start_line: 1007
@@ -1278,6 +1369,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
         rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
@@ -1292,6 +1384,7 @@ license_detections:
           PURPOSE.
     identifier: nilsson_historical-1f77a0ef-7d4f-1428-9fd6-07ecdadd3d9d
   - license_expression: newlib-historical
+    license_expression_spdx: LicenseRef-scancode-newlib-historical
     matches:
       - score: '100.0'
         start_line: 1020
@@ -1301,6 +1394,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
         rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
@@ -1316,6 +1410,7 @@ license_detections:
           they apply.
     identifier: newlib_historical-d8838826-351c-66cc-4bd2-2c3b747dc93e
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1035
@@ -1325,6 +1420,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -1352,6 +1448,7 @@ license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ddbdf2af-d93f-9912-6c83-1167bb9d3f80
   - license_expression: amd-historical
+    license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
       - score: '95.0'
         start_line: 1061
@@ -1361,6 +1458,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
@@ -1374,6 +1472,7 @@ license_detections:
           \ any problems\nor suggestions about this software to the"
     identifier: amd_historical-b5686d7a-c91d-603d-6a57-9b6f23e3c003
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1087
@@ -1383,6 +1482,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -1415,6 +1515,7 @@ license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-3067d87e-03fa-386b-14c5-8c725b58e271
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1119
@@ -1424,6 +1525,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1450,6 +1552,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1145
@@ -1459,6 +1562,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
@@ -1485,6 +1589,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-02e6e9b3-23f0-6c99-5b76-c00ab96724f0
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1171
@@ -1494,6 +1599,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1520,6 +1626,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: x11-hanson
+    license_expression_spdx: LicenseRef-scancode-x11-hanson
     matches:
       - score: '99.0'
         start_line: 1198
@@ -1529,6 +1636,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
         rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
@@ -1545,6 +1653,7 @@ license_detections:
           SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
     identifier: x11_hanson-5e7211ee-2950-c22e-9dac-36a7c8fd780b
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1214
@@ -1554,6 +1663,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1580,6 +1690,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1240
@@ -1589,6 +1700,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
@@ -1616,6 +1728,7 @@ license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-8253b828-e3cb-c484-e1ba-cfca208b3bf2
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1274
@@ -1625,12 +1738,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_39.RULE
         matched_text: Free Software Foundation LGPL License (*-
     identifier: lgpl_2_0_plus-3510e639-5cec-653e-6f61-1a4daf9a674b
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1281
@@ -1640,6 +1755,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_12.RULE
@@ -1666,6 +1782,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl_33.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE
@@ -1678,6 +1795,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_339.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_339.RULE
@@ -1690,6 +1808,7 @@ license_detections:
           \ PURPOSE.  See the\nGNU Library General Public License for more details."
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus-ce146db9-f01c-90ae-37cc-692163db9888
   - license_expression: intel-osl-1993
+    license_expression_spdx: LicenseRef-scancode-intel-osl-1993
     matches:
       - score: '100.0'
         start_line: 1314
@@ -1699,6 +1818,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
         rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
@@ -1728,6 +1848,7 @@ license_detections:
           PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER.
     identifier: intel_osl_1993-19445c9b-464b-0dc8-0e77-c358d42a8657
   - license_expression: hp-1986
+    license_expression_spdx: HP-1986
     matches:
       - score: '100.0'
         start_line: 1342
@@ -1737,6 +1858,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -1753,6 +1875,7 @@ license_detections:
           suitability of this software for any purpose.
     identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '100.0'
         start_line: 1356
@@ -1762,6 +1885,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
@@ -1787,6 +1911,7 @@ license_detections:
           4. This notice may not be removed or altered.
     identifier: hs_regexp-45f2b42c-373c-dcca-6300-bc6a3f618b50
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1381
@@ -1796,6 +1921,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1822,6 +1948,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1407
@@ -1831,6 +1958,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1857,6 +1985,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1435
@@ -1866,6 +1995,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1892,6 +2022,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1466
@@ -1901,6 +2032,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_983.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_983.RULE
@@ -1924,6 +2056,7 @@ license_detections:
           \ OF SUCH DAMAGE."
     identifier: bsd_new-5869de9a-8140-2461-9d3a-19ac46ce9eca
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 1494
@@ -1933,6 +2066,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_6.RULE
@@ -1963,6 +2097,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
@@ -2000,6 +2135,7 @@ license_detections:
           of the copyright holder.
     identifier: unicode-311535c5-21c7-596c-a4ca-130e33826753
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 1550
@@ -2009,6 +2145,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_284.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_284.RULE
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 3a64ff00fac..00edce009c2 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
@@ -46,6 +46,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 83
@@ -55,6 +56,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
@@ -84,6 +86,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
@@ -93,6 +96,7 @@ license_detections:
           Runtime Library Exception (included in this file):
     identifier: gpl_3_0_plus_with_gcc_exception_3_1-515ad309-fd9b-9f8d-bb86-8c7089f7f67a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 123
@@ -102,6 +106,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -124,6 +129,7 @@ license_detections:
           \ THIS SOFTWARE, EVEN IF ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE."
     identifier: bsd_new-ddbdf2af-d93f-9912-6c83-1167bb9d3f80
   - license_expression: uoi-ncsa AND mit
+    license_expression_spdx: NCSA AND MIT
     matches:
       - score: '100.0'
         start_line: 167
@@ -133,6 +139,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: uoi-ncsa
+        spdx_license_expression: NCSA
         rule_identifier: uoi-ncsa_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/uoi-ncsa_9.RULE
@@ -171,6 +178,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -194,6 +202,7 @@ license_detections:
           THE SOFTWARE.
     identifier: uoi_ncsa_and_mit-665f4b33-de00-67e2-f39e-c4aeed276c1e
   - license_expression: mit AND gfdl-1.2 AND gcc-exception-3.1
+    license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 217
@@ -203,6 +212,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1083.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1083.RULE
@@ -233,6 +243,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.2
+        spdx_license_expression: GFDL-1.2-only
         rule_identifier: gfdl-1.2_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2_7.RULE
@@ -248,6 +259,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gcc-exception-3.1
+        spdx_license_expression: GCC-exception-3.1
         rule_identifier: gcc-exception-3.1.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gcc-exception-3.1.LICENSE
@@ -326,6 +338,7 @@ license_detections:
           requirements of the license of GCC.
     identifier: mit_and_gfdl_1_2_and_gcc_exception_3_1-52d926fc-e7f5-999e-1780-6dd7bd70cd6f
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 322
@@ -335,6 +348,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_469.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_469.RULE
@@ -351,6 +365,7 @@ license_detections:
           Library General Public License for more details.
     identifier: lgpl_2_0_plus-35d0fb1e-679a-92c4-4ed4-ba6282419c63
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 338
@@ -360,6 +375,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -375,6 +391,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 356
@@ -384,6 +401,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -399,6 +417,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 374
@@ -408,6 +427,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
@@ -423,6 +443,7 @@ license_detections:
              Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-1e9ed5fb-59c8-38f4-3025-8ef27ff4bcb2
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '70.0'
         start_line: 387
@@ -432,12 +453,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain.
     identifier: public_domain-3dd945ae-65df-7d90-6467-60f8ecf2eb77
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 395
@@ -447,6 +470,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
@@ -462,6 +486,7 @@ license_detections:
              Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-1e9ed5fb-59c8-38f4-3025-8ef27ff4bcb2
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 410
@@ -471,6 +496,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -486,6 +512,7 @@ license_detections:
               Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 424
@@ -495,6 +522,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -505,6 +533,7 @@ license_detections:
            * is preserved.
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 434
@@ -514,6 +543,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
@@ -545,6 +575,7 @@ license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 473
@@ -554,6 +585,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_812.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_812.RULE
@@ -568,6 +600,7 @@ license_detections:
           license in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-61a2eca6-5026-e856-1a3d-dd46fc4ec497
   - license_expression: artistic-perl-1.0 OR gpl-1.0
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only
     matches:
       - score: '100.0'
         start_line: 490
@@ -577,6 +610,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
         rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0_2.RULE
@@ -589,6 +623,7 @@ license_detections:
           license in `/usr/share/common-licenses/Artistic'.
     identifier: artistic_perl_1_0_or_gpl_1_0-3595a871-9965-7e70-31ab-7b75ec03f7f3
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 503
@@ -598,6 +633,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -619,6 +655,7 @@ license_detections:
             3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: d-zlib
+    license_expression_spdx: LicenseRef-scancode-d-zlib
     matches:
       - score: '100.0'
         start_line: 529
@@ -628,6 +665,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: d-zlib
+        spdx_license_expression: LicenseRef-scancode-d-zlib
         rule_identifier: d-zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/d-zlib.LICENSE
@@ -651,6 +689,7 @@ license_detections:
               distribution.
     identifier: d_zlib-b5366170-a1b8-db31-98f3-558ace6d8893
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 557
@@ -660,6 +699,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -684,6 +724,7 @@ license_detections:
              USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 581
@@ -693,6 +734,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
@@ -717,6 +759,7 @@ license_detections:
              .
     identifier: gpl_3_0_plus_with_gcc_exception_3_1-1400acf6-c9c6-a16e-dd05-a6cc5929f4d8
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 606
@@ -726,6 +769,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -741,6 +785,7 @@ license_detections:
           General Public License for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 620
@@ -750,6 +795,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_4.RULE
@@ -760,6 +806,7 @@ license_detections:
           Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
     identifier: gfdl_1_3_plus-df889bb7-d78d-afbe-a993-9f7165b10997
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 629
@@ -769,6 +816,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -784,6 +832,7 @@ license_detections:
           Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+    license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
       - score: '100.0'
         start_line: 643
@@ -793,6 +842,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
         rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
@@ -803,6 +853,7 @@ license_detections:
           version.
     identifier: gpl_3_0_plus_with_gcc_exception_3_1-77ef2921-6876-afac-9289-25e5eb34efc0
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 661
@@ -812,6 +863,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -827,6 +879,7 @@ license_detections:
           Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 675
@@ -836,6 +889,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -851,6 +905,7 @@ license_detections:
           Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 705
@@ -860,6 +915,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -875,6 +931,7 @@ license_detections:
           General Public License for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gpl-3.0-plus AND (gpl-3.0 AND lgpl-2.1)
+    license_expression_spdx: GPL-3.0-or-later AND (GPL-3.0-only AND LGPL-2.1-only)
     matches:
       - score: '100.0'
         start_line: 728
@@ -884,6 +941,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -905,12 +963,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
         rule_identifier: gpl-3.0_and_lgpl-2.1_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_1.RULE
         matched_text: This has a mix of licenses, both LGPL-2.1 and GPL-3.0, plus the apparently
     identifier: gpl_3_0_plus_and__gpl_3_0_and_lgpl_2_1-c16ec1a5-26e8-5560-9e27-e9ca7ec4a7d2
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 757
@@ -920,6 +980,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -935,6 +996,7 @@ license_detections:
           Lesser General Public License for more details.
     identifier: lgpl_2_1_plus-3b5f0e12-e5c2-78c5-f441-4ca7bdfbc474
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 771
@@ -944,6 +1006,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -960,6 +1023,9 @@ license_detections:
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: lgpl-2.1-plus AND (lgpl-3.0 AND gpl-3.0) AND (gpl-3.0 AND lgpl-2.1 AND
       lgpl-3.0) AND (lgpl-2.0 AND gpl-3.0) AND gpl-3.0-plus AND gnu-emacs-gpl-1988
+    license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-only AND GPL-3.0-only) AND (GPL-3.0-only
+      AND LGPL-2.1-only AND LGPL-3.0-only) AND (LGPL-2.0-only AND GPL-3.0-only) AND GPL-3.0-or-later
+      AND LicenseRef-scancode-gnu-emacs-gpl-1988
     matches:
       - score: '100.0'
         start_line: 785
@@ -969,6 +1035,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -990,6 +1057,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-3.0 AND gpl-3.0
+        spdx_license_expression: LGPL-3.0-only AND GPL-3.0-only
         rule_identifier: lgpl-3.0_and_gpl-3.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_and_gpl-3.0_3.RULE
@@ -1002,6 +1070,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
         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
@@ -1014,6 +1083,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
         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
@@ -1026,6 +1096,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0 AND gpl-3.0
+        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
         rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_gpl-3.0_1.RULE
@@ -1038,6 +1109,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_89.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE
@@ -1050,6 +1122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gnu-emacs-gpl-1988
+        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
         rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gnu-emacs-gpl-1988_1.RULE
@@ -1063,6 +1136,7 @@ license_detections:
           ;; and this notice must be preserved on all copies.
     identifier: lgpl_2_1_plus_and__lgpl_3_0_and_gpl_3_0__and__gpl_3_0_and_lgpl_2_1_and_lgpl_3_0__and__lgpl_2_0_and_gpl_3_0__and_gpl_3_0_plus_and_gnu_emacs_gpl_1988-bebf37e4-4b91-2b28-3d6b-8bd51e577b4c
   - license_expression: (gpl-3.0 AND lgpl-2.1) AND (gpl-2.0-plus AND gpl-3.0-plus)
+    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:
       - score: '100.0'
         start_line: 826
@@ -1072,6 +1146,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
         rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_2.RULE
@@ -1084,6 +1159,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
@@ -1091,6 +1167,8 @@ license_detections:
     identifier: gpl_3_0_and_lgpl_2_1__and__gpl_2_0_plus_and_gpl_3_0_plus-41b20618-fcb3-c4b1-b693-d0562b1c05e4
   - license_expression: lgpl-2.1-plus AND (lgpl-2.1 AND lgpl-3.0 AND gpl-3.0) AND (lgpl-2.1
       AND lgpl-3.0)
+    license_expression_spdx: LGPL-2.1-or-later AND (LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only)
+      AND (LGPL-2.1-only AND LGPL-3.0-only)
     matches:
       - score: '100.0'
         start_line: 837
@@ -1100,6 +1178,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
@@ -1121,6 +1200,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.1_and_lgpl-3.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
         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
@@ -1133,6 +1213,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1 AND lgpl-3.0
+        spdx_license_expression: LGPL-2.1-only AND LGPL-3.0-only
         rule_identifier: lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_and_lgpl-3.0_1.RULE
@@ -1145,6 +1226,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_396.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_396.RULE
@@ -1161,6 +1243,7 @@ license_detections:
            Library General Public License for more details.
     identifier: lgpl_2_1_plus_and__lgpl_2_1_and_lgpl_3_0_and_gpl_3_0__and__lgpl_2_1_and_lgpl_3_0-d98cca80-ca02-194f-67c1-081450d70c19
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 872
@@ -1170,6 +1253,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -1185,6 +1269,7 @@ license_detections:
           for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 886
@@ -1194,6 +1279,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -1209,6 +1295,7 @@ license_detections:
           General Public License for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 899
@@ -1218,6 +1305,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -1233,6 +1321,7 @@ license_detections:
           for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 913
@@ -1242,6 +1331,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
@@ -1257,6 +1347,7 @@ license_detections:
           GNU General Public License for more details.
     identifier: gpl_3_0_plus-8e3845a7-0660-b619-feb1-108f0b0c6227
   - license_expression: lgpl-2.0-plus AND gpl-1.0-plus
+    license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 947
@@ -1266,6 +1357,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
@@ -1279,6 +1371,7 @@ license_detections:
           license be found in /usr/share/common-licenses/LGPL.
     identifier: lgpl_2_0_plus_and_gpl_1_0_plus-ea6120ce-febd-518c-1a96-ebf5ad359b44
   - license_expression: bsla-no-advert
+    license_expression_spdx: LicenseRef-scancode-bsla-no-advert
     matches:
       - score: '100.0'
         start_line: 962
@@ -1288,6 +1381,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsla-no-advert
+        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
         rule_identifier: bsla-no-advert.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla-no-advert.LICENSE
@@ -1302,6 +1396,7 @@ license_detections:
           \ PARTICULAR PURPOSE."
     identifier: bsla_no_advert-57978d98-817a-ef5a-43bc-8507eaddaf43
   - license_expression: bsla
+    license_expression_spdx: BSD-4.3TAHOE
     matches:
       - score: '100.0'
         start_line: 979
@@ -1311,6 +1406,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
         rule_identifier: bsla.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla.LICENSE
@@ -1328,6 +1424,7 @@ license_detections:
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: bsla-f5e6e752-5580-dedf-4978-65f27db044cc
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 997
@@ -1337,6 +1434,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1370,6 +1468,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1030
@@ -1379,6 +1478,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -1408,6 +1508,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 1064
@@ -1417,6 +1518,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1450,6 +1552,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: flex-2.5
+    license_expression_spdx: BSD-3-Clause-flex
     matches:
       - score: '100.0'
         start_line: 1097
@@ -1459,6 +1562,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
         rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
@@ -1478,6 +1582,7 @@ license_detections:
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: flex_2_5-dc2b38a4-d8d9-e49a-8c97-65694300b4be
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 1117
@@ -1487,6 +1592,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc.RULE
@@ -1494,6 +1600,8 @@ license_detections:
     identifier: bsd_original_uc-3028f908-0199-4878-9644-da1c6c536067
   - 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
+    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
     matches:
       - score: '100.0'
         start_line: 1127
@@ -1504,6 +1612,8 @@ license_detections:
         matcher: 2-aho
         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
+          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
         rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
@@ -1513,6 +1623,7 @@ license_detections:
           details.
     identifier: 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-97e72829-8548-5a17-f1ec-868edb9679fc
   - license_expression: x11-lucent
+    license_expression_spdx: dtoa
     matches:
       - score: '100.0'
         start_line: 1137
@@ -1522,6 +1633,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-lucent
+        spdx_license_expression: dtoa
         rule_identifier: x11-lucent.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
@@ -1538,6 +1650,7 @@ license_detections:
           OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
     identifier: x11_lucent-0e33f797-24ab-9665-2d4b-10a0ff4d546d
   - license_expression: amd-historical
+    license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
       - score: '100.0'
         start_line: 1152
@@ -1547,6 +1660,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
@@ -1565,6 +1679,7 @@ license_detections:
           or  suggestions about this software
     identifier: amd_historical-2ce3eef6-3c42-bf88-a157-854440a529af
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 1191
@@ -1574,6 +1689,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -1582,6 +1698,7 @@ license_detections:
           \ this notice \nis preserved."
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: hp-1986
+    license_expression_spdx: HP-1986
     matches:
       - score: '100.0'
         start_line: 1200
@@ -1591,6 +1708,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -1607,6 +1725,7 @@ license_detections:
           suitability of this software for any purpose.
     identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d
   - license_expression: nilsson-historical
+    license_expression_spdx: LicenseRef-scancode-nilsson-historical
     matches:
       - score: '100.0'
         start_line: 1215
@@ -1616,6 +1735,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
         rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
@@ -1630,6 +1750,7 @@ license_detections:
           PURPOSE.
     identifier: nilsson_historical-1f77a0ef-7d4f-1428-9fd6-07ecdadd3d9d
   - license_expression: newlib-historical
+    license_expression_spdx: LicenseRef-scancode-newlib-historical
     matches:
       - score: '100.0'
         start_line: 1228
@@ -1639,6 +1760,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
         rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
@@ -1654,6 +1776,7 @@ license_detections:
           they apply.
     identifier: newlib_historical-d8838826-351c-66cc-4bd2-2c3b747dc93e
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1243
@@ -1663,6 +1786,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
@@ -1690,6 +1814,7 @@ license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ddbdf2af-d93f-9912-6c83-1167bb9d3f80
   - license_expression: amd-historical
+    license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
       - score: '95.0'
         start_line: 1269
@@ -1699,6 +1824,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
         rule_identifier: amd-historical4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
@@ -1712,6 +1838,7 @@ license_detections:
           \ any problems\nor suggestions about this software to the"
     identifier: amd_historical-b5686d7a-c91d-603d-6a57-9b6f23e3c003
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1295
@@ -1721,6 +1848,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -1753,6 +1881,7 @@ license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-3067d87e-03fa-386b-14c5-8c725b58e271
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1327
@@ -1762,6 +1891,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1788,6 +1918,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1353
@@ -1797,6 +1928,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
@@ -1823,6 +1955,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-02e6e9b3-23f0-6c99-5b76-c00ab96724f0
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1379
@@ -1832,6 +1965,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1858,6 +1992,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: x11-hanson
+    license_expression_spdx: LicenseRef-scancode-x11-hanson
     matches:
       - score: '99.0'
         start_line: 1406
@@ -1867,6 +2002,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
         rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
@@ -1883,6 +2019,7 @@ license_detections:
           SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
     identifier: x11_hanson-5e7211ee-2950-c22e-9dac-36a7c8fd780b
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1422
@@ -1892,6 +2029,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -1918,6 +2056,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1448
@@ -1927,6 +2066,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
@@ -1954,6 +2094,7 @@ license_detections:
           ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-8253b828-e3cb-c484-e1ba-cfca208b3bf2
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1482
@@ -1963,12 +2104,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_39.RULE
         matched_text: Free Software Foundation LGPL License (*-
     identifier: lgpl_2_0_plus-3510e639-5cec-653e-6f61-1a4daf9a674b
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1489
@@ -1978,6 +2121,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_12.RULE
@@ -2004,6 +2148,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl_33.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE
@@ -2016,6 +2161,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_339.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_339.RULE
@@ -2028,6 +2174,7 @@ license_detections:
           \ PURPOSE.  See the\nGNU Library General Public License for more details."
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus-ce146db9-f01c-90ae-37cc-692163db9888
   - license_expression: intel-osl-1993
+    license_expression_spdx: LicenseRef-scancode-intel-osl-1993
     matches:
       - score: '100.0'
         start_line: 1522
@@ -2037,6 +2184,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
         rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
@@ -2066,6 +2214,7 @@ license_detections:
           PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER.
     identifier: intel_osl_1993-19445c9b-464b-0dc8-0e77-c358d42a8657
   - license_expression: hp-1986
+    license_expression_spdx: HP-1986
     matches:
       - score: '100.0'
         start_line: 1550
@@ -2075,6 +2224,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hp-1986
+        spdx_license_expression: HP-1986
         rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
@@ -2091,6 +2241,7 @@ license_detections:
           suitability of this software for any purpose.
     identifier: hp_1986-28bf595d-945f-f17e-30dc-d425078ee11d
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '100.0'
         start_line: 1564
@@ -2100,6 +2251,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
@@ -2125,6 +2277,7 @@ license_detections:
           4. This notice may not be removed or altered.
     identifier: hs_regexp-45f2b42c-373c-dcca-6300-bc6a3f618b50
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1589
@@ -2134,6 +2287,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -2160,6 +2314,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1615
@@ -2169,6 +2324,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -2195,6 +2351,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1643
@@ -2204,6 +2361,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -2230,6 +2388,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1674
@@ -2239,6 +2398,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_983.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_983.RULE
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 1de59f708e3..489431c2194 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
@@ -38,6 +38,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.05'
         start_line: 85
@@ -47,6 +48,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_594.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_594.RULE
@@ -79,6 +81,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-1529bb96-2d58-f678-a443-d3bbbf37a9ff
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 114
@@ -88,6 +91,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -102,6 +106,7 @@ other_license_detections:
           PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: ietf
+    license_expression_spdx: LicenseRef-scancode-ietf
     matches:
       - score: '90.0'
         start_line: 129
@@ -111,6 +116,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
         rule_identifier: ietf_7.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_7.RULE
@@ -133,6 +139,7 @@ other_license_detections:
           revoked by the Internet Society or its successors or assigns.
     identifier: ietf-020936d7-aad7-a859-aa41-3ef78b39c612
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 147
@@ -142,6 +149,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -154,6 +162,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_480.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_480.RULE
@@ -176,6 +185,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-59e30787-1a62-c2cf-50f5-e0d50fffcd04
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 165
@@ -185,6 +195,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -197,6 +208,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_191.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_191.RULE
@@ -219,6 +231,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-3'.
     identifier: lgpl_3_0_plus-1cede042-6a19-16e7-f08a-f722296d0745
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 183
@@ -228,6 +241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -240,6 +254,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_307.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_307.RULE
@@ -262,6 +277,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-75b8a956-d72b-ab7f-5921-bec21e7047bb
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 202
@@ -271,6 +287,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
@@ -301,6 +318,7 @@ other_license_detections:
           OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-d710da7a-d455-7e11-d6d1-e58805668aae
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 228
@@ -310,6 +328,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -334,6 +353,7 @@ other_license_detections:
           USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 247
@@ -343,6 +363,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -355,6 +376,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_131.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_131.RULE
@@ -367,6 +389,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/CC0-1.0.
     identifier: cc0_1_0-28709819-142f-86f2-a09a-d8ab5f97a889
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 81
@@ -376,6 +399,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_321.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_321.RULE
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 83cec02feaa..c6953000e15 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
@@ -10,6 +10,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 23
@@ -19,6 +20,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -31,6 +33,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_481.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_481.RULE
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 099a8850800..35cde5765f0 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
@@ -15,6 +15,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 25
@@ -24,6 +25,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -36,6 +38,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_482.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_482.RULE
@@ -57,6 +60,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-64267dbf-cd13-53b6-0e75-79a84b05d3cf
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 43
@@ -66,6 +70,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_24.RULE
@@ -80,6 +85,7 @@ other_license_detections:
           License can be found in `/usr/share/common-licenses/GFDL-3'.
     identifier: gfdl_1_3_plus-60c54326-73ad-53e9-8924-f9dfc5748830
   - license_expression: latex2e
+    license_expression_spdx: Latex2e
     matches:
       - score: '85.0'
         start_line: 53
@@ -89,6 +95,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: latex2e
+        spdx_license_expression: Latex2e
         rule_identifier: latex2e_8.RULE
         rule_relevance: 85
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_8.RULE
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 4c839ac4a1c..04190626bb0 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 12
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1033.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1033.RULE
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 0a8141435f7..6a9c98c23e4 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
@@ -15,6 +15,7 @@ other_license_expression_spdx: BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-or-lat
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 25
@@ -24,6 +25,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -36,6 +38,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -58,6 +61,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 47
@@ -67,6 +71,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1068.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1068.RULE
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 467802477e2..4ccd72c0e83 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
@@ -10,6 +10,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 8
@@ -19,6 +20,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -31,6 +33,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
@@ -55,6 +58,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
@@ -63,6 +67,7 @@ other_license_detections:
           can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-6749e336-e70c-3988-4833-e4900655801f
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 39
@@ -72,6 +77,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -84,6 +90,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_306.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_306.RULE
@@ -102,6 +109,7 @@ other_license_detections:
           along with this program.  If not, see .
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-c21bb300-ded5-f5b0-2943-5f76e0f2f623
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 22
@@ -111,6 +119,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
@@ -119,6 +128,7 @@ other_license_detections:
           can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f5a12419-1f21-0dcb-9684-72c2f6e40432
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 53
@@ -128,6 +138,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_325.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_325.RULE
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 8b83319e3a4..064f65324a7 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 4
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_374.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE
@@ -26,6 +28,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_736.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_736.RULE
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 4bd89cb57bb..74a6b3f5576 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
@@ -10,6 +10,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later AND GPL-2.
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 8
@@ -19,6 +20,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -31,6 +33,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
@@ -55,6 +58,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
@@ -63,6 +67,7 @@ other_license_detections:
           can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-6749e336-e70c-3988-4833-e4900655801f
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 32
@@ -72,6 +77,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -84,6 +90,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_306.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_306.RULE
@@ -102,6 +109,7 @@ other_license_detections:
           along with this program.  If not, see .
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-c21bb300-ded5-f5b0-2943-5f76e0f2f623
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 22
@@ -111,6 +119,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
@@ -119,6 +128,7 @@ other_license_detections:
           can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f5a12419-1f21-0dcb-9684-72c2f6e40432
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 46
@@ -128,6 +138,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_325.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_325.RULE
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 ec3541abecb..4721ad5e819 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
@@ -13,6 +13,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 16
@@ -22,6 +23,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -34,6 +36,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_372.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_372.RULE
@@ -45,6 +48,7 @@ other_license_detections:
            for the complete text of the GNU Lesser General Public License.
     identifier: lgpl_2_1-20d58352-2308-f9d4-19be-3c2cf2b3336a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 28
@@ -54,6 +58,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -66,6 +71,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1031.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1031.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 a82f12f1b87..7dd301ffe5d 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
@@ -8,6 +8,7 @@ other_license_expression_spdx: bzip2-1.0.6 AND (GPL-2.0-only AND GPL-2.0-only)
 license_detections: []
 other_license_detections:
   - license_expression: bzip2-libbzip-2010
+    license_expression_spdx: bzip2-1.0.6
     matches:
       - score: '100.0'
         start_line: 8
@@ -17,6 +18,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
         rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
@@ -53,6 +55,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bzip2_libbzip_2010-72b4db44-6142-9aeb-acd2-1d8f2447148c
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 46
@@ -62,6 +65,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -74,6 +78,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1294.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1294.RULE
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 de7dcea1563..bb967e597aa 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
@@ -14,6 +14,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -23,6 +24,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_1.RULE
@@ -46,6 +48,7 @@ license_detections:
             General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-effa9b0d-2dd9-16c2-f7de-6c9b6389a0c1
   - license_expression: gpl-2.0-plus AND bsd-new
+    license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause
     matches:
       - score: '95.0'
         start_line: 33
@@ -55,6 +58,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_15.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_15.RULE
@@ -83,6 +87,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_24.RULE
@@ -91,6 +96,7 @@ license_detections:
             license:
     identifier: gpl_2_0_plus_and_bsd_new-8c21febb-54ca-ba5d-046f-fee85ec37185
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 56
@@ -100,6 +106,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_57.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_57.RULE
@@ -131,6 +138,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-b6760a68-89b7-1bd6-4698-89448b896f0e
   - license_expression: historical
+    license_expression_spdx: HPND
     matches:
       - score: '100.0'
         start_line: 88
@@ -140,6 +148,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: historical
+        spdx_license_expression: HPND
         rule_identifier: historical_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
@@ -161,6 +170,7 @@ license_detections:
               WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: historical-322b727f-722e-1ae7-dd47-9d55d61e81ec
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 108
@@ -170,6 +180,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -188,6 +199,7 @@ license_detections:
               SOFTWARE.
     identifier: isc-fbf6f8d8-a949-0427-62b2-aef52fe84e71
   - license_expression: bsd-new AND carnegie-mellon-contributors
+    license_expression_spdx: BSD-3-Clause AND CMU-Mach
     matches:
       - score: '100.0'
         start_line: 126
@@ -197,6 +209,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
@@ -235,6 +248,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: carnegie-mellon-contributors
+        spdx_license_expression: CMU-Mach
         rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/carnegie-mellon-contributors_3.RULE
@@ -274,6 +288,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_592.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_592.RULE
@@ -312,6 +327,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_593.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_593.RULE
@@ -322,6 +338,7 @@ license_detections:
               Intel License Agreement
     identifier: bsd_new_and_carnegie_mellon_contributors-45f65077-fffa-19dd-b436-5027d4b2f218
   - license_expression: bsd-new AND inner-net-2.0
+    license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0
     matches:
       - score: '100.0'
         start_line: 217
@@ -331,6 +348,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_2.RULE
@@ -369,6 +387,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: inner-net-2.0
+        spdx_license_expression: Inner-Net-2.0
         rule_identifier: inner-net-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/inner-net-2.0_2.RULE
@@ -411,6 +430,7 @@ license_detections:
                 If these license terms cause you a real problem, contact the author.  */
     identifier: bsd_new_and_inner_net_2_0-532e8013-dbb6-0b26-da03-db6fd50178c1
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 286
@@ -420,6 +440,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_177.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_177.RULE
@@ -430,6 +451,7 @@ license_detections:
               see  to obtain a copy.
     identifier: lgpl_2_1_plus-cbb754d2-a8a7-b58c-4ef8-315e1df5356e
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 298
@@ -439,6 +461,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_491.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_491.RULE
@@ -463,6 +486,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_573.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_573.RULE
@@ -471,6 +495,7 @@ license_detections:
               gunidecomp.c, all licensed under LGPL and copyright hold by:
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus-04228d42-945a-cc8b-eba4-536171dd96ee
   - license_expression: punycode AND ietf
+    license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf
     matches:
       - score: '100.0'
         start_line: 324
@@ -480,6 +505,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: punycode
+        spdx_license_expression: LicenseRef-scancode-punycode
         rule_identifier: punycode.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/punycode.LICENSE
@@ -501,6 +527,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
         rule_identifier: ietf.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ietf.LICENSE
@@ -530,6 +557,7 @@ license_detections:
               MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
     identifier: punycode_and_ietf-b9a37f0a-236b-5181-9ab2-2312abe8f010
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 365
@@ -539,6 +567,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
@@ -568,6 +597,7 @@ license_detections:
               SUCH DAMAGE.
     identifier: bsd_new-1c9f5e21-d1f7-70e3-725e-68240c6ce757
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 395
@@ -577,6 +607,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_144.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_144.RULE
@@ -598,6 +629,7 @@ license_detections:
               PERFORMANCE OF THIS SOFTWARE.
     identifier: other_permissive-464315b0-8a5a-0d67-4a44-3fd90abf71f7
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '100.0'
         start_line: 414
@@ -607,6 +639,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
@@ -632,6 +665,7 @@ license_detections:
               4. This notice may not be removed or altered.
     identifier: hs_regexp-45f2b42c-373c-dcca-6300-bc6a3f618b50
   - license_expression: pcre
+    license_expression_spdx: LicenseRef-scancode-pcre
     matches:
       - score: '95.0'
         start_line: 438
@@ -641,6 +675,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
         rule_identifier: pcre_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_2.RULE
@@ -683,6 +718,7 @@ license_detections:
                 which it is incompatible.
     identifier: pcre-d4f9dab2-85b9-1c79-0a5b-a4431a4d0a8c
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 479
@@ -692,6 +728,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -702,6 +739,7 @@ license_detections:
               is preserved.
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 488
@@ -711,6 +749,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_145.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_145.RULE
@@ -721,6 +760,7 @@ license_detections:
                    2. you leave this copyright notice intact.
     identifier: other_permissive-ef3b6b92-0319-fdb5-7719-25b5d16e6fe9
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 497
@@ -730,6 +770,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
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 de7dcea1563..bb967e597aa 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
@@ -14,6 +14,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -23,6 +24,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_1.RULE
@@ -46,6 +48,7 @@ license_detections:
             General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-effa9b0d-2dd9-16c2-f7de-6c9b6389a0c1
   - license_expression: gpl-2.0-plus AND bsd-new
+    license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause
     matches:
       - score: '95.0'
         start_line: 33
@@ -55,6 +58,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_15.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_15.RULE
@@ -83,6 +87,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_24.RULE
@@ -91,6 +96,7 @@ license_detections:
             license:
     identifier: gpl_2_0_plus_and_bsd_new-8c21febb-54ca-ba5d-046f-fee85ec37185
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 56
@@ -100,6 +106,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_57.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_57.RULE
@@ -131,6 +138,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-b6760a68-89b7-1bd6-4698-89448b896f0e
   - license_expression: historical
+    license_expression_spdx: HPND
     matches:
       - score: '100.0'
         start_line: 88
@@ -140,6 +148,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: historical
+        spdx_license_expression: HPND
         rule_identifier: historical_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
@@ -161,6 +170,7 @@ license_detections:
               WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: historical-322b727f-722e-1ae7-dd47-9d55d61e81ec
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 108
@@ -170,6 +180,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -188,6 +199,7 @@ license_detections:
               SOFTWARE.
     identifier: isc-fbf6f8d8-a949-0427-62b2-aef52fe84e71
   - license_expression: bsd-new AND carnegie-mellon-contributors
+    license_expression_spdx: BSD-3-Clause AND CMU-Mach
     matches:
       - score: '100.0'
         start_line: 126
@@ -197,6 +209,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
@@ -235,6 +248,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: carnegie-mellon-contributors
+        spdx_license_expression: CMU-Mach
         rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/carnegie-mellon-contributors_3.RULE
@@ -274,6 +288,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_592.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_592.RULE
@@ -312,6 +327,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_593.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_593.RULE
@@ -322,6 +338,7 @@ license_detections:
               Intel License Agreement
     identifier: bsd_new_and_carnegie_mellon_contributors-45f65077-fffa-19dd-b436-5027d4b2f218
   - license_expression: bsd-new AND inner-net-2.0
+    license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0
     matches:
       - score: '100.0'
         start_line: 217
@@ -331,6 +348,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_2.RULE
@@ -369,6 +387,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: inner-net-2.0
+        spdx_license_expression: Inner-Net-2.0
         rule_identifier: inner-net-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/inner-net-2.0_2.RULE
@@ -411,6 +430,7 @@ license_detections:
                 If these license terms cause you a real problem, contact the author.  */
     identifier: bsd_new_and_inner_net_2_0-532e8013-dbb6-0b26-da03-db6fd50178c1
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 286
@@ -420,6 +440,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_177.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_177.RULE
@@ -430,6 +451,7 @@ license_detections:
               see  to obtain a copy.
     identifier: lgpl_2_1_plus-cbb754d2-a8a7-b58c-4ef8-315e1df5356e
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 298
@@ -439,6 +461,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_491.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_491.RULE
@@ -463,6 +486,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_573.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_573.RULE
@@ -471,6 +495,7 @@ license_detections:
               gunidecomp.c, all licensed under LGPL and copyright hold by:
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus-04228d42-945a-cc8b-eba4-536171dd96ee
   - license_expression: punycode AND ietf
+    license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf
     matches:
       - score: '100.0'
         start_line: 324
@@ -480,6 +505,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: punycode
+        spdx_license_expression: LicenseRef-scancode-punycode
         rule_identifier: punycode.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/punycode.LICENSE
@@ -501,6 +527,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
         rule_identifier: ietf.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ietf.LICENSE
@@ -530,6 +557,7 @@ license_detections:
               MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
     identifier: punycode_and_ietf-b9a37f0a-236b-5181-9ab2-2312abe8f010
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 365
@@ -539,6 +567,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
@@ -568,6 +597,7 @@ license_detections:
               SUCH DAMAGE.
     identifier: bsd_new-1c9f5e21-d1f7-70e3-725e-68240c6ce757
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 395
@@ -577,6 +607,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_144.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_144.RULE
@@ -598,6 +629,7 @@ license_detections:
               PERFORMANCE OF THIS SOFTWARE.
     identifier: other_permissive-464315b0-8a5a-0d67-4a44-3fd90abf71f7
   - license_expression: hs-regexp
+    license_expression_spdx: Spencer-94
     matches:
       - score: '100.0'
         start_line: 414
@@ -607,6 +639,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
@@ -632,6 +665,7 @@ license_detections:
               4. This notice may not be removed or altered.
     identifier: hs_regexp-45f2b42c-373c-dcca-6300-bc6a3f618b50
   - license_expression: pcre
+    license_expression_spdx: LicenseRef-scancode-pcre
     matches:
       - score: '95.0'
         start_line: 438
@@ -641,6 +675,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
         rule_identifier: pcre_2.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_2.RULE
@@ -683,6 +718,7 @@ license_detections:
                 which it is incompatible.
     identifier: pcre-d4f9dab2-85b9-1c79-0a5b-a4431a4d0a8c
   - license_expression: sunpro
+    license_expression_spdx: SunPro
     matches:
       - score: '100.0'
         start_line: 479
@@ -692,6 +728,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sunpro
+        spdx_license_expression: SunPro
         rule_identifier: sunpro.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
@@ -702,6 +739,7 @@ license_detections:
               is preserved.
     identifier: sunpro-8cbf8f94-4a9d-af5a-dc57-033780c667f7
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 488
@@ -711,6 +749,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_145.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_145.RULE
@@ -721,6 +760,7 @@ license_detections:
                    2. you leave this copyright notice intact.
     identifier: other_permissive-ef3b6b92-0319-fdb5-7719-25b5d16e6fe9
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 497
@@ -730,6 +770,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
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 a5628cab7e3..1b4dbd40b2f 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_388.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_388.RULE
@@ -35,6 +37,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_209.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_209.RULE
@@ -43,6 +46,7 @@ license_detections:
           See `/usr/share/common-licenses/GPL-2'.
     identifier: lgpl_2_1_plus_and_gpl_2_0_plus-b90093f2-2cc2-c7e4-89e0-83414f4c0a88
   - license_expression: gpl-3.0
+    license_expression_spdx: GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 37
@@ -52,6 +56,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_468.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_468.RULE
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 b9e5dad7fae..5f68ea38e23 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 14
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
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 1294042ebed..de8e119980c 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
@@ -18,6 +18,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '97.06'
         start_line: 14
@@ -27,6 +28,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_297.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_297.RULE
@@ -36,6 +38,8 @@ license_detections:
           the file COPYING.LIB for the full terms of this license.
     identifier: lgpl_2_1_plus-020c4fdd-bb0b-ba56-db94-aa6a942c9bd8
   - license_expression: lgpl-2.1-plus AND bsd-new AND public-domain AND bsd-zero AND bsd-simplified
+    license_expression_spdx: LGPL-2.1-or-later AND BSD-3-Clause AND LicenseRef-scancode-public-domain
+      AND 0BSD AND BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 22
@@ -45,6 +49,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_392.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_392.RULE
@@ -57,6 +62,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_392.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_392.RULE
@@ -69,6 +75,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_308.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE
@@ -81,6 +88,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_426.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
@@ -93,6 +101,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_426.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
@@ -105,6 +114,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
@@ -117,6 +127,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
@@ -129,6 +140,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
@@ -141,12 +153,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
     identifier: lgpl_2_1_plus_and_bsd_new_and_public_domain_and_bsd_zero_and_bsd_simplified-0789af82-1187-8c17-de70-8f158fe859dd
   - license_expression: bsd-zero
+    license_expression_spdx: 0BSD
     matches:
       - score: '100.0'
         start_line: 55
@@ -156,12 +170,15 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
     identifier: bsd_zero-79fb5c8c-8a93-cf25-4481-532b6b01d3b7
   - license_expression: bsd-zero AND bsd-simplified AND public-domain AND bsd-new
+    license_expression_spdx: 0BSD AND BSD-2-Clause AND LicenseRef-scancode-public-domain AND
+      BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 61
@@ -171,6 +188,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
@@ -183,6 +201,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
@@ -195,6 +214,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
@@ -207,6 +227,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
@@ -219,6 +240,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
@@ -231,6 +253,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_426.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
@@ -243,6 +266,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_308.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE
@@ -255,6 +279,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
@@ -267,6 +292,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_426.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
@@ -274,6 +300,8 @@ license_detections:
     identifier: bsd_zero_and_bsd_simplified_and_public_domain_and_bsd_new-33742a24-5ed2-ddf4-f29a-58e0cddc9766
   - license_expression: gpl-3.0-plus WITH autoconf-exception-3.0 AND bsd-zero AND fsf-ap AND
       gpl-2.0-plus WITH autoconf-simple-exception-2.0 AND free-unknown
+    license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-3.0 AND 0BSD AND FSFAP
+      AND GPL-2.0-or-later WITH Autoconf-exception-generic AND LicenseRef-scancode-free-unknown
     matches:
       - score: '99.0'
         start_line: 98
@@ -283,6 +311,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
         rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         rule_relevance: 99
         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
@@ -295,6 +324,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-zero
+        spdx_license_expression: 0BSD
         rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
@@ -307,6 +337,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -319,6 +350,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -331,6 +363,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -343,6 +376,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -355,6 +389,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
         rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_17.RULE
         rule_relevance: 99
         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
@@ -367,6 +402,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -379,6 +415,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -391,6 +428,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
         rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         rule_relevance: 99
         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
@@ -403,6 +441,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -415,6 +454,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
@@ -427,6 +467,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
         rule_identifier: free-unknown_120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_120.RULE
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 78bd00025cf..c99d9b063af 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: sleepycat
+    license_expression_spdx: Sleepycat
     matches:
       - score: '100.0'
         start_line: 5
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sleepycat
+        spdx_license_expression: Sleepycat
         rule_identifier: sleepycat_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_17.RULE
@@ -29,6 +31,7 @@ license_detections:
           please contact Oracle at berkeleydb-info_us@oracle.com.
     identifier: sleepycat-0b546f04-dee3-6f0f-7cfb-5ef05c060879
   - license_expression: sleepycat
+    license_expression_spdx: Sleepycat
     matches:
       - score: '100.0'
         start_line: 18
@@ -38,6 +41,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: sleepycat
+        spdx_license_expression: Sleepycat
         rule_identifier: sleepycat_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_15.RULE
@@ -74,6 +78,7 @@ license_detections:
            * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: sleepycat-137b65e9-cdff-e8b1-adf2-2377ce1d6f33
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 53
@@ -83,6 +88,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -112,6 +118,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 81
@@ -121,6 +128,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_943.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE
@@ -150,6 +158,7 @@ license_detections:
            * SUCH DAMAGE.
     identifier: bsd_new-35c287f1-5d41-52f8-399e-2391cd1b4b40
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 111
@@ -159,6 +168,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_115.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_115.RULE
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 128179137bc..601165cfd28 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 17
@@ -14,12 +15,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_282.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_282.RULE
         matched_text: derived portions are public domain)
     identifier: public_domain-8b1c4208-37f4-199b-a316-29e1b9bdceca
   - license_expression: bsd-unmodified
+    license_expression_spdx: LicenseRef-scancode-bsd-unmodified
     matches:
       - score: '100.0'
         start_line: 22
@@ -29,6 +32,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-unmodified
+        spdx_license_expression: LicenseRef-scancode-bsd-unmodified
         rule_identifier: bsd-unmodified_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unmodified_4.RULE
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 2783592c4b5..dd8da3c19f6 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
+    license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
       - score: '99.02'
         start_line: 17
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '99.02'
         matcher: 3-seq
         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
         rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
@@ -30,6 +32,7 @@ license_detections:
           \  The\ncomplete text of the GNU Library General Public License can be found\nin '/usr/share/common-licenses/LGPL-2'."
     identifier: gpl_2_0_and_lgpl_2_0_and_bsd_new_and_mit_old_style_no_advert-aed55561-0504-0265-5986-832cc7f7bbf2
   - license_expression: ntp-0 AND bsd-new
+    license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 38
@@ -39,6 +42,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ntp-0
+        spdx_license_expression: NTP-0
         rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
@@ -59,6 +63,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 c189192ae0e..0ac57042bd5 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit AND gpl-2.0-plus AND gpl-1.0-plus
+    license_expression_spdx: MIT AND GPL-2.0-or-later AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 42
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -44,6 +46,7 @@ license_detections:
         match_coverage: '79.17'
         matcher: 3-seq
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_858.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_858.RULE
@@ -65,6 +68,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_858.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_858.RULE
@@ -85,6 +89,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_478.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_478.RULE
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 151b3db1228..0cf176d166d 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
@@ -18,6 +18,9 @@ other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-1.0-plus AND other-permissive AND public-domain AND fsf-unlimited-no-warranty
       AND (lgpl-2.1-plus AND gpl-2.0-plus) AND (lgpl-2.0-plus AND gpl-2.0-plus) AND lgpl-2.0-plus
+    license_expression_spdx: GPL-1.0-or-later AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-public-domain
+      AND FSFULLRWD AND (LGPL-2.1-or-later AND GPL-2.0-or-later) AND (LGPL-2.0-or-later AND
+      GPL-2.0-or-later) AND LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 210
@@ -27,6 +30,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_477.RULE
@@ -41,6 +45,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_319.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_319.RULE
@@ -53,6 +58,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_311.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_311.RULE
@@ -65,6 +71,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -84,6 +91,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.1-plus_and_gpl-2.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-2.0-plus_2.RULE
@@ -102,6 +110,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.0-plus_and_gpl-2.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-2.0-plus_7.RULE
@@ -135,12 +144,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_467.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_467.RULE
         matched_text: the license headers of the LGPL
     identifier: gpl_1_0_plus_and_other_permissive_and_public_domain_and_fsf_unlimited_no_warranty_and__lgpl_2_1_plus_and_gpl_2_0_plus__and__lgpl_2_0_plus_and_gpl_2_0_plus__and_lgpl_2_0_plus-71da280b-c092-be79-7ec6-e3cc205ddfd8
   - license_expression: lgpl-2.1-plus AND gpl-1.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 270
@@ -150,6 +161,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_322.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_322.RULE
@@ -179,12 +191,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_476.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_476.RULE
         matched_text: The documentation licensed under the GPL
     identifier: lgpl_2_1_plus_and_gpl_1_0_plus-1af8506a-97be-93a0-6cba-7d1c0a97c09e
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 294
@@ -194,6 +208,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_767.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_767.RULE
@@ -205,6 +220,7 @@ license_detections:
           section entitled ``GNU General Public License''.
     identifier: gpl_2_0_plus-f0a5b3d9-dda2-71aa-c005-5b1325e37f04
   - license_expression: other-permissive AND other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
     matches:
       - score: '100.0'
         start_line: 307
@@ -214,6 +230,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive AND other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
         rule_identifier: other-permissive_and_other-copyleft_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_other-copyleft_3.RULE
@@ -222,6 +239,7 @@ license_detections:
           General Public License (LGPL) or the GNU General Public License (GPL).
     identifier: other_permissive_and_other_copyleft-63e4a2bf-16c2-8dee-73c5-f24d627936b1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 315
@@ -231,12 +249,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_947.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_947.RULE
         matched_text: BSD_3Clause
     identifier: bsd_new-a83045d9-7f1e-552d-a2b3-29267dd1d408
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 330
@@ -246,6 +266,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_152.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_152.RULE
@@ -280,6 +301,7 @@ license_detections:
             SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-5cc0e99a-0b5a-11eb-e919-1cf09ba89f04
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 372
@@ -289,6 +311,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl_2.RULE
@@ -326,6 +349,7 @@ license_detections:
            * DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-f8085429-0058-17f2-8a37-27a1965c9f8a
   - license_expression: x11-xconsortium AND public-domain
+    license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 413
@@ -335,6 +359,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -368,12 +393,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain
     identifier: x11_xconsortium_and_public_domain-3a4b5640-3d0e-289d-2ed6-5568ba1f72cd
   - license_expression: public-domain AND ocb-open-source-2013
+    license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-ocb-open-source-2013
     matches:
       - score: '100.0'
         start_line: 443
@@ -383,6 +410,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_326.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_326.RULE
@@ -397,12 +425,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
         rule_identifier: ocb-open-source-2013_12.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_12.RULE
         matched_text: OCB license 1
     identifier: public_domain_and_ocb_open_source_2013-7ef7f6b1-6db5-43c8-5a10-9e3da7f87fef
   - license_expression: ocb-open-source-2013
+    license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013
     matches:
       - score: '100.0'
         start_line: 453
@@ -412,6 +442,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
         rule_identifier: ocb-open-source-2013_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_11.RULE
@@ -429,6 +460,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
         rule_identifier: ocb-open-source-2013_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_8.RULE
@@ -449,6 +481,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
         rule_identifier: ocb-open-source-2013_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_10.RULE
@@ -526,6 +559,7 @@ license_detections:
            SUCH DAMAGES PRIOR TO SUCH AN OCCURRENCE.
     identifier: ocb_open_source_2013-2bec0450-e55d-5281-9cd2-08adae19cdaa
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 545
@@ -535,6 +569,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1159.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1159.RULE
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 61c59a64909..fadaf80a48a 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-3.0-plus OR gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: '19'
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_27.RULE
@@ -50,6 +52,7 @@ license_detections:
           The GNU General Public License v3 text is contained in /usr/share/common-licenses/GPL-3.
     identifier: lgpl_3_0_plus_or_gpl_2_0_plus-e7f6b716-c9f5-2be9-e260-13311d75d318
   - license_expression: gfdl-1.1-plus AND (lgpl-2.0-plus OR gpl-1.0-plus)
+    license_expression_spdx: GFDL-1.1-or-later AND (LGPL-2.0-or-later OR GPL-1.0-or-later)
     matches:
       - score: '100.0'
         start_line: 52
@@ -59,6 +62,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.1-plus
+        spdx_license_expression: GFDL-1.1-or-later
         rule_identifier: gfdl-1.1-plus_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.1-plus_32.RULE
@@ -75,6 +79,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.0-plus_or_gpl-1.0-plus_300.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_or_gpl-1.0-plus_300.RULE
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 b320b15f174..14d5aeb876e 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
@@ -51,6 +51,8 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-3.0-plus AND (lgpl-3.0-plus AND gpl-2.0-plus)
+    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)
     matches:
       - score: '100.0'
         start_line: 221
@@ -60,6 +62,8 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          AND GPL-2.0-or-later)
         rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_and_lgpl-3.0-plus_and_gpl-2.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-3.0-plus_and_lgpl-3.0-plus_and_gpl-2.0-plus_2.RULE
@@ -79,6 +83,7 @@ license_detections:
           version were LGPLv3+ only.)
     identifier: lgpl_2_1_plus_and_gpl_3_0_plus_and__lgpl_3_0_plus_and_gpl_2_0_plus-a9c7859c-4d60-c275-2477-f4be4f1526bd
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 244
@@ -88,6 +93,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_257.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_257.RULE
@@ -106,6 +112,7 @@ license_detections:
            * along with this program.  If not, see 
     identifier: lgpl_2_1_plus-67610a04-4270-7209-f379-80a601f1be1c
   - license_expression: gpl-3.0-plus AND gfdl-1.1-plus
+    license_expression_spdx: GPL-3.0-or-later AND GFDL-1.1-or-later
     matches:
       - score: '100.0'
         start_line: 265
@@ -115,6 +122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_395.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_395.RULE
@@ -139,6 +147,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.1-plus
+        spdx_license_expression: GFDL-1.1-or-later
         rule_identifier: gfdl-1.1-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.1-plus_34.RULE
@@ -147,6 +156,7 @@ license_detections:
           Documentation License (FDL):
     identifier: gpl_3_0_plus_and_gfdl_1_1_plus-679f3824-a513-560e-34f2-1d07f9135b82
   - license_expression: gfdl-1.3-plus
+    license_expression_spdx: GFDL-1.3-or-later
     matches:
       - score: '100.0'
         start_line: 286
@@ -156,6 +166,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
@@ -168,6 +179,8 @@ license_detections:
                section entitled "GNU Free Documentation License".
     identifier: gfdl_1_3_plus-07dd7e9d-9df0-a5d7-2970-ca1db4485238
   - license_expression: lgpl-2.0-plus AND lgpl-3.0 AND gpl-1.0-plus AND gpl-3.0 AND gfdl-1.3
+    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
     matches:
       - score: '100.0'
         start_line: 321
@@ -177,6 +190,8 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          GPL-3.0-only AND GFDL-1.3-only
         rule_identifier: lgpl-2.0-plus_and_lgpl-3.0_and_gpl-1.0-plus_and_gpl-3.0_and_gfdl-1.3_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_lgpl-3.0_and_gpl-1.0-plus_and_gpl-3.0_and_gfdl-1.3_1.RULE
@@ -190,6 +205,7 @@ license_detections:
           License is available under /usr/share/common-licenses/GFDL-1.3.
     identifier: lgpl_2_0_plus_and_lgpl_3_0_and_gpl_1_0_plus_and_gpl_3_0_and_gfdl_1_3-68ce99d1-c14e-c6ea-98ee-b80c28c03e41
   - license_expression: lgpl-2.1-plus AND (lgpl-3.0-plus OR gpl-2.0-plus)
+    license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
     matches:
       - score: '100.0'
         start_line: 336
@@ -199,6 +215,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_391.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_391.RULE
@@ -213,6 +230,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_26.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_26.RULE
@@ -222,6 +240,7 @@ license_detections:
           GPLv2+ license.
     identifier: lgpl_2_1_plus_and__lgpl_3_0_plus_or_gpl_2_0_plus-c689cef8-f628-a8f3-cdb7-140bacf9047b
   - license_expression: lgpl-2.0-plus AND gpl-3.0
+    license_expression_spdx: LGPL-2.0-or-later AND GPL-3.0-only
     matches:
       - score: '100.0'
         start_line: 347
@@ -231,6 +250,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl_48.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_48.RULE
@@ -243,12 +263,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
         rule_identifier: gpl-3.0_472.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_472.RULE
         matched_text: library are under the GNU GPL version 3.
     identifier: lgpl_2_0_plus_and_gpl_3_0-dcb32f87-5315-099e-bacf-ff21fe9c3759
   - license_expression: bsd-new OR gpl-1.0-plus
+    license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 370
@@ -258,6 +280,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
         rule_identifier: bsd-new_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_7.RULE
@@ -297,6 +320,7 @@ license_detections:
           # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new_or_gpl_1_0_plus-209abb9f-676c-3064-b95e-6a47ade1a129
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 417
@@ -306,6 +330,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_8.RULE
@@ -331,6 +356,7 @@ license_detections:
            * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-4f707584-2d08-0eb7-9357-f3a9bd6f3d3a
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '99.0'
         start_line: 446
@@ -340,6 +366,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
@@ -348,6 +375,7 @@ license_detections:
            Public domain.
     identifier: public_domain-1a6a4f2c-bd92-9942-920f-be3d0c2bbda6
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 458
@@ -357,6 +385,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -375,6 +404,7 @@ license_detections:
            * SOFTWARE.
     identifier: isc-fbf6f8d8-a949-0427-62b2-aef52fe84e71
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 476
@@ -384,6 +414,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_147.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_147.RULE
@@ -421,6 +452,7 @@ license_detections:
                 Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
     identifier: cc0_1_0-2a74ad03-c6f0-0d49-b4e5-8682628d8bec
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 510
@@ -430,6 +462,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -442,6 +475,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -465,6 +499,7 @@ license_detections:
            OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-ce632f87-3a7d-7ead-5164-8fd75ef60032
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 533
@@ -474,6 +509,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
@@ -497,6 +533,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
@@ -506,6 +543,7 @@ license_detections:
            /usr/share/common-licenses/Apache-2.0
     identifier: apache_2_0-77108417-de52-352e-3f26-e563af77179e
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 556
@@ -515,12 +553,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 564
@@ -530,6 +570,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
@@ -539,6 +580,7 @@ license_detections:
            /usr/share/common-licenses/Apache-2.0
     identifier: apache_2_0-cbd06688-dec1-7024-4252-d9805873fa97
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 572
@@ -548,6 +590,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_923.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_923.RULE
@@ -568,6 +611,7 @@ license_detections:
            # limitations under the License.
     identifier: apache_2_0-733ce4fd-e7d4-3837-d273-ab787a1f28b0
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 591
@@ -577,6 +621,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_923.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_923.RULE
@@ -597,6 +642,7 @@ license_detections:
            # limitations under the License.
     identifier: apache_2_0-733ce4fd-e7d4-3837-d273-ab787a1f28b0
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 610
@@ -606,6 +652,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_919.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_919.RULE
@@ -620,6 +667,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
@@ -629,6 +677,7 @@ license_detections:
            /usr/share/common-licenses/Apache-2.0
     identifier: apache_2_0-4da41457-a672-75b7-6a82-83b34d4546db
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 619
@@ -638,6 +687,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -650,6 +700,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -673,6 +724,7 @@ license_detections:
            * DEALINGS IN THE SOFTWARE.
     identifier: mit-ce632f87-3a7d-7ead-5164-8fd75ef60032
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 645
@@ -682,6 +734,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -694,6 +747,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -717,6 +771,7 @@ license_detections:
            * DEALINGS IN THE SOFTWARE.
     identifier: mit-ce632f87-3a7d-7ead-5164-8fd75ef60032
   - license_expression: mit AND lgpl-2.1-plus
+    license_expression_spdx: MIT AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 667
@@ -726,6 +781,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -738,6 +794,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -767,12 +824,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
         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+'
     identifier: mit_and_lgpl_2_1_plus-ac329c30-2f5d-a40f-905d-d126eef3c5d1
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 695
@@ -782,6 +841,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -794,12 +854,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 705
@@ -809,6 +871,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_437.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
@@ -821,6 +884,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -845,6 +909,7 @@ license_detections:
            SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-ce632f87-3a7d-7ead-5164-8fd75ef60032
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 729
@@ -854,12 +919,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 735
@@ -869,12 +936,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 741
@@ -884,6 +953,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -896,6 +966,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -908,6 +979,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -920,12 +992,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-b4e65bb2-6eb0-e8d4-702f-7d8adaca65f5
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 759
@@ -935,12 +1009,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 764
@@ -950,6 +1026,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -962,6 +1039,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -974,6 +1052,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -986,6 +1065,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -998,12 +1078,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-e47b5aad-c451-e58f-e295-28b4a946f26f
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 785
@@ -1013,6 +1095,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -1025,12 +1108,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 794
@@ -1040,12 +1125,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
+    license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 799
@@ -1055,6 +1142,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -1067,12 +1155,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: (lgpl-3.0-plus AND gpl-2.0-plus) AND mit
+    license_expression_spdx: (LGPL-3.0-or-later AND GPL-2.0-or-later) AND MIT
     matches:
       - score: '100.0'
         start_line: 808
@@ -1082,6 +1172,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -1094,6 +1185,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1118,6 +1210,7 @@ license_detections:
            * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus__and_mit-84fdb61a-6dde-fd9b-39f3-090fac62c53d
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 838
@@ -1127,6 +1220,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1152,6 +1246,8 @@ license_detections:
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: lgpl-2.1-plus AND (lgpl-3.0-plus AND gpl-2.0-plus) AND (lgpl-3.0-plus
       OR gpl-2.0-plus)
+    license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-or-later AND GPL-2.0-or-later)
+      AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
     matches:
       - score: '100.0'
         start_line: 866
@@ -1161,6 +1257,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_320.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_320.RULE
@@ -1185,6 +1282,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -1197,6 +1295,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
         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
@@ -1209,6 +1308,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_23.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_23.RULE
@@ -1238,6 +1338,7 @@ license_detections:
            *  not, see http://www.gnu.org/licenses/.
     identifier: lgpl_2_1_plus_and__lgpl_3_0_plus_and_gpl_2_0_plus__and__lgpl_3_0_plus_or_gpl_2_0_plus-b642fd2e-6b0d-f616-3aea-66b829eccdee
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 927
@@ -1247,12 +1348,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 940
@@ -1262,12 +1365,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 945
@@ -1277,6 +1382,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1289,12 +1395,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-6f74e383-639f-5369-8d93-48aa1ec12853
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 954
@@ -1304,12 +1412,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 964
@@ -1319,6 +1429,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1331,6 +1442,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_299.RULE
@@ -1343,12 +1455,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus_and_lgpl_2_1_plus-3a037210-69a9-35de-52da-97d13672a103
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 978
@@ -1358,12 +1472,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 983
@@ -1373,12 +1489,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 988
@@ -1388,12 +1506,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 993
@@ -1403,12 +1523,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 999
@@ -1418,12 +1540,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1006
@@ -1433,12 +1557,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1011
@@ -1448,6 +1574,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1460,6 +1587,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1472,12 +1600,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-b9c2bb21-041b-aefb-84f5-ecb3fa0c78f4
   - license_expression: gpl-3.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 1024
@@ -1487,6 +1617,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1499,6 +1630,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1511,6 +1643,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1523,6 +1656,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1535,12 +1669,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
         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+'
     identifier: gpl_3_0_plus_and_lgpl_2_1_plus-d232e3ee-7ec1-e56b-a14e-06d8be46d430
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1047
@@ -1550,12 +1686,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1052
@@ -1565,6 +1703,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1577,12 +1716,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-6f74e383-639f-5369-8d93-48aa1ec12853
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 1061
@@ -1592,6 +1733,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1604,6 +1746,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
@@ -1616,12 +1759,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-b9c2bb21-041b-aefb-84f5-ecb3fa0c78f4
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1074
@@ -1631,6 +1776,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_195.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE
@@ -1643,6 +1789,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1066.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1066.RULE
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 421a99bfb97..c4e699aca30 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
@@ -29,6 +29,7 @@ other_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (LG
 license_detections: []
 other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 57
@@ -38,6 +39,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -51,6 +53,7 @@ other_license_detections:
           implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 65
@@ -60,6 +63,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -72,6 +76,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_390.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_390.RULE
@@ -94,6 +99,7 @@ other_license_detections:
           version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_plus-b69e098d-e26d-66eb-a9eb-d64b9fb65747
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 83
@@ -103,6 +109,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -115,6 +122,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_385.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_385.RULE
@@ -136,6 +144,7 @@ other_license_detections:
           version 3 can be found in /usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0_plus-d32e0b16-ec08-400f-7308-94bab4d18d11
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 101
@@ -145,6 +154,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
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 e1261dcb11f..4882caf643f 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
@@ -24,6 +24,8 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-simplified AND generic-export-compliance AND cc-by-sa-3.0
+    license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
+      AND CC-BY-SA-3.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -33,6 +35,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
@@ -67,6 +70,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
         rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
@@ -91,6 +95,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
@@ -100,6 +105,7 @@ license_detections:
           (http://creativecommons.org/licenses/by-sa/3.0/)
     identifier: bsd_simplified_and_generic_export_compliance_and_cc_by_sa_3_0-33db6ba2-24df-220e-9776-12e2f090117e
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 64
@@ -109,6 +115,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
@@ -122,6 +129,7 @@ license_detections:
           recognition of their trademark status should be given).
     identifier: proprietary_license-ae26591e-560d-5622-14d0-ff1ff9a49b22
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 82
@@ -131,6 +139,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
@@ -167,6 +176,7 @@ license_detections:
              community.
     identifier: other_permissive-46e6e2b3-dadb-a39b-50ee-b8a8739b526d
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '98.73'
         start_line: 128
@@ -176,6 +186,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
@@ -201,6 +212,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-1128ece3-2db6-bad0-d5d9-6c912fa4983c
   - license_expression: brian-gladman-3-clause
+    license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
       - score: '100.0'
         start_line: 156
@@ -210,6 +222,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
         rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
@@ -236,6 +249,7 @@ license_detections:
              to, correctness and fitness for purpose.
     identifier: brian_gladman_3_clause-7a3ee4cc-fd00-4912-cc3a-c1abe777f891
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 187
@@ -245,6 +259,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
@@ -279,6 +294,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-66fbca06-fdde-6367-5e72-bd742f214050
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 222
@@ -288,6 +304,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -313,6 +330,7 @@ license_detections:
              DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 248
@@ -322,6 +340,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
@@ -353,6 +372,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-fe5ce6eb-1b7c-6cd1-2e78-e9f71b0262f1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 334
@@ -362,6 +382,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -387,6 +408,7 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 363
@@ -396,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -430,6 +453,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 400
@@ -439,6 +463,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
@@ -473,6 +498,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-dc7f0df2-c1a1-daeb-6556-1f60f5c4484c
   - license_expression: michigan-disclaimer
+    license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
       - score: '100.0'
         start_line: 440
@@ -482,6 +508,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
         rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
@@ -508,6 +535,7 @@ license_detections:
              IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
     identifier: michigan_disclaimer-f90073dd-2b26-8fe5-d12a-32531681f44a
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 469
@@ -517,6 +545,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -531,6 +560,7 @@ license_detections:
              PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '100.0'
         start_line: 485
@@ -540,6 +570,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
@@ -565,6 +596,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-d6c84c49-6090-f5cb-35df-480e9ca265bf
   - license_expression: openldap-2.8
+    license_expression_spdx: OLDAP-2.8
     matches:
       - score: '100.0'
         start_line: 511
@@ -574,6 +606,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
@@ -628,6 +661,7 @@ license_detections:
              distribute verbatim copies of this document is granted.
     identifier: openldap_2_8-58e150c7-83e9-bea6-0075-83fa7a4a9025
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 568
@@ -637,6 +671,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -671,6 +706,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-3067d87e-03fa-386b-14c5-8c725b58e271
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 608
@@ -680,6 +716,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
@@ -715,6 +752,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 647
@@ -724,6 +762,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
@@ -759,6 +798,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
   - license_expression: freebsd-doc
+    license_expression_spdx: FreeBSD-DOC
     matches:
       - score: '100.0'
         start_line: 682
@@ -768,6 +808,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
         rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
@@ -798,6 +839,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: freebsd_doc-9db33af1-af77-1b9f-27f4-0ae766439a3a
   - license_expression: cmu-uc
+    license_expression_spdx: MIT-CMU
     matches:
       - score: '99.0'
         start_line: 713
@@ -807,6 +849,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
         rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
@@ -830,6 +873,7 @@ license_detections:
              SOFTWARE.
     identifier: cmu_uc-81218bbc-ee50-f7e2-791a-f18dcff965fd
   - license_expression: nrl-permission
+    license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
       - score: '95.0'
         start_line: 735
@@ -839,6 +883,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
         rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
@@ -854,6 +899,7 @@ license_detections:
              RESULTING FROM THE USE OF THIS SOFTWARE.
     identifier: nrl_permission-69f7eb46-92e8-fb4c-6788-8285e4f7effa
   - license_expression: ietf-trust
+    license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
       - score: '100.0'
         start_line: 752
@@ -863,6 +909,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
         rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
@@ -881,6 +928,7 @@ license_detections:
              PARTICULAR PURPOSE.
     identifier: ietf_trust-f268e8cf-010e-2ddb-9692-832496073cf3
   - license_expression: mit-old-style
+    license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
       - score: '100.0'
         start_line: 769
@@ -890,6 +938,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
         rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
@@ -904,6 +953,7 @@ license_detections:
              warranty.
     identifier: mit_old_style-1e993fd4-e311-4d2f-c751-607871e23414
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 782
@@ -913,6 +963,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -938,6 +989,8 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified AND (mit-no-advert-export-control AND proprietary-license)
+    license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
+      AND LicenseRef-scancode-proprietary-license)
     matches:
       - score: '100.0'
         start_line: 810
@@ -947,6 +1000,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -983,6 +1037,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
         rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
@@ -1009,6 +1064,7 @@ license_detections:
              distributor of the ksu software.
     identifier: bsd_simplified_and__mit_no_advert_export_control_and_proprietary_license-345b28a9-f29e-4bc5-6160-59a84fd1aadf
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 866
@@ -1018,6 +1074,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1058,6 +1115,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '99.0'
         start_line: 907
@@ -1067,6 +1125,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
@@ -1089,6 +1148,7 @@ license_detections:
              is" without express or implied warranty.
     identifier: mit_no_advert_export_control-8a3f7c38-f5cb-2016-0e86-70fb9f16ca5c
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 934
@@ -1098,6 +1158,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
@@ -1139,6 +1200,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_original-07212ebb-4bc6-b4e9-de7c-a4d294184c21
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 978
@@ -1148,6 +1210,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_483.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
@@ -1173,6 +1236,7 @@ license_detections:
              OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-c00d5dad-390d-222f-7182-5d856cf7b8de
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 1004
@@ -1182,6 +1246,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -1201,6 +1266,7 @@ license_detections:
              CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '95.0'
         start_line: 1025
@@ -1210,6 +1276,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_16.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
@@ -1229,6 +1296,7 @@ license_detections:
              this kind of disclaimer?)
     identifier: isc-e2afa98f-2f94-8ed0-73b4-11ad7eb78f27
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 1046
@@ -1238,6 +1306,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
@@ -1246,6 +1315,7 @@ license_detections:
              provided this copyright message remains intact.
     identifier: other_permissive-159ebe90-9eb6-c7d5-9749-3fca97d30548
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1060
@@ -1255,6 +1325,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
@@ -1289,6 +1360,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_new-12f1ac86-ca22-4cc1-70be-ff0581226e16
   - license_expression: rsa-md4
+    license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
       - score: '100.0'
         start_line: 1096
@@ -1298,6 +1370,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
         rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
@@ -1321,6 +1394,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md4-a759e81a-f925-4fa7-feb4-1653e6ac100e
   - license_expression: rsa-md5
+    license_expression_spdx: RSA-MD
     matches:
       - score: '100.0'
         start_line: 1121
@@ -1330,6 +1404,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
         rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
@@ -1353,6 +1428,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md5-15c129b1-dd57-a1d1-c398-85cc6d20017e
   - license_expression: rsa-1990
+    license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
       - score: '100.0'
         start_line: 1147
@@ -1362,6 +1438,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
         rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
@@ -1375,6 +1452,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_1990-2041758f-0e05-d693-1067-8e6b055aa3ee
   - license_expression: mit-with-modification-obligations
+    license_expression_spdx: HPND-export-US-modify
     matches:
       - score: '100.0'
         start_line: 1163
@@ -1384,6 +1462,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
         rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
@@ -1409,6 +1488,7 @@ license_detections:
              provided "as is" without express or implied warranty.
     identifier: mit_with_modification_obligations-42eb6af6-0f2c-428f-f892-f4bb7295452c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1190
@@ -1418,6 +1498,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
@@ -1452,6 +1533,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-92ffce46-c317-d9f5-e740-a98f7d6eb994
   - license_expression: bsd-simplified OR gpl-2.0-plus
+    license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1226
@@ -1461,6 +1543,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
         rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
@@ -1506,6 +1589,7 @@ license_detections:
              version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: bsd_simplified_or_gpl_2_0_plus-061f1e82-e3fd-1972-4fbc-961626a0b57a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1274
@@ -1515,6 +1599,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
@@ -1550,6 +1635,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-27fdae2b-970d-afa7-4ecb-ef39abbe9d1e
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1311
@@ -1559,6 +1645,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
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 f33b7b4432a..48a1156afa9 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
@@ -194,6 +194,7 @@ other_license_expression_spdx: ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GP
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 276
@@ -203,6 +204,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -215,6 +217,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_460.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_460.RULE
@@ -238,6 +241,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL-2.
     identifier: lgpl_2_0_plus-974dd354-ef44-944d-ffbb-69b6be081731
   - license_expression: gpl-3.0-plus AND gpl-3.0-plus WITH tex-exception
+    license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception
     matches:
       - score: '100.0'
         start_line: 489
@@ -247,6 +251,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -259,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH tex-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
         rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_tex-exception_5.RULE
@@ -281,6 +287,7 @@ other_license_detections:
           restriction.  (This has been our intent since Texinfo was invented.)
     identifier: gpl_3_0_plus_and_gpl_3_0_plus_with_tex_exception-71564435-9876-cce5-4982-7b2b76b00f2e
   - license_expression: autoconf-simple-exception-2.0
+    license_expression_spdx: Autoconf-exception-generic
     matches:
       - score: '100.0'
         start_line: 525
@@ -290,6 +297,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
         rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
@@ -300,6 +308,7 @@ other_license_detections:
           the same distribution terms that you use for the rest of that program.
     identifier: autoconf_simple_exception_2_0-9f49705d-f825-5107-3217-345df57f18c4
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 533
@@ -309,6 +318,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_354.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_354.RULE
@@ -317,6 +327,7 @@ other_license_detections:
           expression eligible for copyright.
     identifier: public_domain-08996397-ee56-6ff8-8fb7-35f9f0b96837
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 539
@@ -326,6 +337,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -338,6 +350,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1155.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1155.RULE
@@ -361,6 +374,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0-b47eb271-c5ef-bd9e-ddea-7766c795aa06
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 565
@@ -370,6 +384,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_3.RULE
@@ -379,6 +394,7 @@ other_license_detections:
           notice and this notice are preserved.
     identifier: fsf_ap-e6bce55e-c5a1-cd3c-4dee-8eea6cc9bbe3
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 569
@@ -388,6 +404,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -400,6 +417,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_196.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_196.RULE
@@ -422,6 +440,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL.
     identifier: lgpl_3_0_plus-4223bfa7-54f8-4a73-f2df-0e6a63fd31a5
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 587
@@ -431,6 +450,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -443,6 +463,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_857.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_857.RULE
@@ -467,6 +488,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL.
     identifier: gpl_2_0_plus-efe6b372-1df6-a999-a97e-2bc9e6ec9898
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 608
@@ -476,6 +498,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -501,6 +524,9 @@ other_license_detections:
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: ((gpl-2.0-plus OR gpl-3.0-plus) AND other-permissive AND public-domain)
       AND public-domain AND lgpl-2.0-plus AND mit AND pycrypto AND lgpl-2.1-plus
+    license_expression_spdx: ((GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive
+      AND LicenseRef-scancode-public-domain) AND LicenseRef-scancode-public-domain AND LGPL-2.0-or-later
+      AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -510,6 +536,8 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          AND LicenseRef-scancode-public-domain
         rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
@@ -529,6 +557,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -541,6 +570,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_515.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_515.RULE
@@ -553,6 +583,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1090.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1090.RULE
@@ -565,6 +596,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pycrypto
+        spdx_license_expression: LicenseRef-scancode-pycrypto
         rule_identifier: pycrypto_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pycrypto_1.RULE
@@ -579,6 +611,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -591,6 +624,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -603,6 +637,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
@@ -617,6 +652,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_425.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_425.RULE
@@ -629,6 +665,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
@@ -643,6 +680,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -655,6 +693,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_465.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_465.RULE
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 397069b2e35..8f030a880dc 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
@@ -20,6 +20,7 @@ other_license_expression_spdx: (GPL-3.0-or-later AND GPL-3.0-or-later) AND ((LGP
 license_detections: []
 other_license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 28
@@ -29,6 +30,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -41,6 +43,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_288.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_288.RULE
@@ -62,6 +65,7 @@ other_license_detections:
           License version 3 can be found in /usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0_plus-72ba7e1f-5a94-0166-4814-d0e59799bcd4
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 45
@@ -71,6 +75,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -83,6 +88,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_740.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_740.RULE
@@ -104,6 +110,7 @@ other_license_detections:
           License version 2 can be found in /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus-dde05ee1-8772-bb9a-d36b-c75646c05589
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 62
@@ -113,6 +120,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -125,6 +133,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_242.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_242.RULE
@@ -146,6 +155,7 @@ other_license_detections:
           Public License version 3 can be found in /usr/share/common-licenses/LGPL-3.
     identifier: lgpl_3_0_plus-cb77b810-0c5c-bef8-0c96-b51c5109756f
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 80
@@ -155,6 +165,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_14.RULE
@@ -167,6 +178,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
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 e1261dcb11f..4882caf643f 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
@@ -24,6 +24,8 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-simplified AND generic-export-compliance AND cc-by-sa-3.0
+    license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
+      AND CC-BY-SA-3.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -33,6 +35,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
@@ -67,6 +70,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
         rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
@@ -91,6 +95,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
@@ -100,6 +105,7 @@ license_detections:
           (http://creativecommons.org/licenses/by-sa/3.0/)
     identifier: bsd_simplified_and_generic_export_compliance_and_cc_by_sa_3_0-33db6ba2-24df-220e-9776-12e2f090117e
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 64
@@ -109,6 +115,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
@@ -122,6 +129,7 @@ license_detections:
           recognition of their trademark status should be given).
     identifier: proprietary_license-ae26591e-560d-5622-14d0-ff1ff9a49b22
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 82
@@ -131,6 +139,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
@@ -167,6 +176,7 @@ license_detections:
              community.
     identifier: other_permissive-46e6e2b3-dadb-a39b-50ee-b8a8739b526d
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '98.73'
         start_line: 128
@@ -176,6 +186,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
@@ -201,6 +212,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-1128ece3-2db6-bad0-d5d9-6c912fa4983c
   - license_expression: brian-gladman-3-clause
+    license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
       - score: '100.0'
         start_line: 156
@@ -210,6 +222,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
         rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
@@ -236,6 +249,7 @@ license_detections:
              to, correctness and fitness for purpose.
     identifier: brian_gladman_3_clause-7a3ee4cc-fd00-4912-cc3a-c1abe777f891
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 187
@@ -245,6 +259,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
@@ -279,6 +294,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-66fbca06-fdde-6367-5e72-bd742f214050
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 222
@@ -288,6 +304,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -313,6 +330,7 @@ license_detections:
              DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 248
@@ -322,6 +340,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
@@ -353,6 +372,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-fe5ce6eb-1b7c-6cd1-2e78-e9f71b0262f1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 334
@@ -362,6 +382,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -387,6 +408,7 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 363
@@ -396,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -430,6 +453,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 400
@@ -439,6 +463,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
@@ -473,6 +498,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-dc7f0df2-c1a1-daeb-6556-1f60f5c4484c
   - license_expression: michigan-disclaimer
+    license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
       - score: '100.0'
         start_line: 440
@@ -482,6 +508,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
         rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
@@ -508,6 +535,7 @@ license_detections:
              IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
     identifier: michigan_disclaimer-f90073dd-2b26-8fe5-d12a-32531681f44a
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 469
@@ -517,6 +545,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -531,6 +560,7 @@ license_detections:
              PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '100.0'
         start_line: 485
@@ -540,6 +570,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
@@ -565,6 +596,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-d6c84c49-6090-f5cb-35df-480e9ca265bf
   - license_expression: openldap-2.8
+    license_expression_spdx: OLDAP-2.8
     matches:
       - score: '100.0'
         start_line: 511
@@ -574,6 +606,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
@@ -628,6 +661,7 @@ license_detections:
              distribute verbatim copies of this document is granted.
     identifier: openldap_2_8-58e150c7-83e9-bea6-0075-83fa7a4a9025
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 568
@@ -637,6 +671,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -671,6 +706,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-3067d87e-03fa-386b-14c5-8c725b58e271
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 608
@@ -680,6 +716,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
@@ -715,6 +752,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 647
@@ -724,6 +762,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
@@ -759,6 +798,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
   - license_expression: freebsd-doc
+    license_expression_spdx: FreeBSD-DOC
     matches:
       - score: '100.0'
         start_line: 682
@@ -768,6 +808,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
         rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
@@ -798,6 +839,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: freebsd_doc-9db33af1-af77-1b9f-27f4-0ae766439a3a
   - license_expression: cmu-uc
+    license_expression_spdx: MIT-CMU
     matches:
       - score: '99.0'
         start_line: 713
@@ -807,6 +849,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
         rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
@@ -830,6 +873,7 @@ license_detections:
              SOFTWARE.
     identifier: cmu_uc-81218bbc-ee50-f7e2-791a-f18dcff965fd
   - license_expression: nrl-permission
+    license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
       - score: '95.0'
         start_line: 735
@@ -839,6 +883,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
         rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
@@ -854,6 +899,7 @@ license_detections:
              RESULTING FROM THE USE OF THIS SOFTWARE.
     identifier: nrl_permission-69f7eb46-92e8-fb4c-6788-8285e4f7effa
   - license_expression: ietf-trust
+    license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
       - score: '100.0'
         start_line: 752
@@ -863,6 +909,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
         rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
@@ -881,6 +928,7 @@ license_detections:
              PARTICULAR PURPOSE.
     identifier: ietf_trust-f268e8cf-010e-2ddb-9692-832496073cf3
   - license_expression: mit-old-style
+    license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
       - score: '100.0'
         start_line: 769
@@ -890,6 +938,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
         rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
@@ -904,6 +953,7 @@ license_detections:
              warranty.
     identifier: mit_old_style-1e993fd4-e311-4d2f-c751-607871e23414
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 782
@@ -913,6 +963,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -938,6 +989,8 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified AND (mit-no-advert-export-control AND proprietary-license)
+    license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
+      AND LicenseRef-scancode-proprietary-license)
     matches:
       - score: '100.0'
         start_line: 810
@@ -947,6 +1000,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -983,6 +1037,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
         rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
@@ -1009,6 +1064,7 @@ license_detections:
              distributor of the ksu software.
     identifier: bsd_simplified_and__mit_no_advert_export_control_and_proprietary_license-345b28a9-f29e-4bc5-6160-59a84fd1aadf
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 866
@@ -1018,6 +1074,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1058,6 +1115,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '99.0'
         start_line: 907
@@ -1067,6 +1125,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
@@ -1089,6 +1148,7 @@ license_detections:
              is" without express or implied warranty.
     identifier: mit_no_advert_export_control-8a3f7c38-f5cb-2016-0e86-70fb9f16ca5c
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 934
@@ -1098,6 +1158,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
@@ -1139,6 +1200,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_original-07212ebb-4bc6-b4e9-de7c-a4d294184c21
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 978
@@ -1148,6 +1210,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_483.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
@@ -1173,6 +1236,7 @@ license_detections:
              OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-c00d5dad-390d-222f-7182-5d856cf7b8de
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 1004
@@ -1182,6 +1246,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -1201,6 +1266,7 @@ license_detections:
              CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '95.0'
         start_line: 1025
@@ -1210,6 +1276,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_16.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
@@ -1229,6 +1296,7 @@ license_detections:
              this kind of disclaimer?)
     identifier: isc-e2afa98f-2f94-8ed0-73b4-11ad7eb78f27
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 1046
@@ -1238,6 +1306,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
@@ -1246,6 +1315,7 @@ license_detections:
              provided this copyright message remains intact.
     identifier: other_permissive-159ebe90-9eb6-c7d5-9749-3fca97d30548
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1060
@@ -1255,6 +1325,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
@@ -1289,6 +1360,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_new-12f1ac86-ca22-4cc1-70be-ff0581226e16
   - license_expression: rsa-md4
+    license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
       - score: '100.0'
         start_line: 1096
@@ -1298,6 +1370,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
         rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
@@ -1321,6 +1394,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md4-a759e81a-f925-4fa7-feb4-1653e6ac100e
   - license_expression: rsa-md5
+    license_expression_spdx: RSA-MD
     matches:
       - score: '100.0'
         start_line: 1121
@@ -1330,6 +1404,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
         rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
@@ -1353,6 +1428,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md5-15c129b1-dd57-a1d1-c398-85cc6d20017e
   - license_expression: rsa-1990
+    license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
       - score: '100.0'
         start_line: 1147
@@ -1362,6 +1438,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
         rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
@@ -1375,6 +1452,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_1990-2041758f-0e05-d693-1067-8e6b055aa3ee
   - license_expression: mit-with-modification-obligations
+    license_expression_spdx: HPND-export-US-modify
     matches:
       - score: '100.0'
         start_line: 1163
@@ -1384,6 +1462,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
         rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
@@ -1409,6 +1488,7 @@ license_detections:
              provided "as is" without express or implied warranty.
     identifier: mit_with_modification_obligations-42eb6af6-0f2c-428f-f892-f4bb7295452c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1190
@@ -1418,6 +1498,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
@@ -1452,6 +1533,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-92ffce46-c317-d9f5-e740-a98f7d6eb994
   - license_expression: bsd-simplified OR gpl-2.0-plus
+    license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1226
@@ -1461,6 +1543,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
         rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
@@ -1506,6 +1589,7 @@ license_detections:
              version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: bsd_simplified_or_gpl_2_0_plus-061f1e82-e3fd-1972-4fbc-961626a0b57a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1274
@@ -1515,6 +1599,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
@@ -1550,6 +1635,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-27fdae2b-970d-afa7-4ecb-ef39abbe9d1e
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1311
@@ -1559,6 +1645,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
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 8d1d7682893..1a28e57781f 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
@@ -13,6 +13,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (LGPL
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 20
@@ -22,6 +23,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -34,6 +36,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_983.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_983.RULE
@@ -55,6 +58,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/GPL-2 file.
     identifier: gpl_2_0_plus-fe100017-b30d-a3e1-08b9-40cc9f056db5
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 37
@@ -64,6 +68,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -76,6 +81,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
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 e1261dcb11f..4882caf643f 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
@@ -24,6 +24,8 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-simplified AND generic-export-compliance AND cc-by-sa-3.0
+    license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
+      AND CC-BY-SA-3.0
     matches:
       - score: '100.0'
         start_line: 18
@@ -33,6 +35,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
@@ -67,6 +70,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
         rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
@@ -91,6 +95,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
         rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
@@ -100,6 +105,7 @@ license_detections:
           (http://creativecommons.org/licenses/by-sa/3.0/)
     identifier: bsd_simplified_and_generic_export_compliance_and_cc_by_sa_3_0-33db6ba2-24df-220e-9776-12e2f090117e
   - license_expression: proprietary-license
+    license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
       - score: '100.0'
         start_line: 64
@@ -109,6 +115,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
         rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
@@ -122,6 +129,7 @@ license_detections:
           recognition of their trademark status should be given).
     identifier: proprietary_license-ae26591e-560d-5622-14d0-ff1ff9a49b22
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 82
@@ -131,6 +139,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
@@ -167,6 +176,7 @@ license_detections:
              community.
     identifier: other_permissive-46e6e2b3-dadb-a39b-50ee-b8a8739b526d
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '98.73'
         start_line: 128
@@ -176,6 +186,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
@@ -201,6 +212,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-1128ece3-2db6-bad0-d5d9-6c912fa4983c
   - license_expression: brian-gladman-3-clause
+    license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
       - score: '100.0'
         start_line: 156
@@ -210,6 +222,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
         rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
@@ -236,6 +249,7 @@ license_detections:
              to, correctness and fitness for purpose.
     identifier: brian_gladman_3_clause-7a3ee4cc-fd00-4912-cc3a-c1abe777f891
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 187
@@ -245,6 +259,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
@@ -279,6 +294,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-66fbca06-fdde-6367-5e72-bd742f214050
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 222
@@ -288,6 +304,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -313,6 +330,7 @@ license_detections:
              DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 248
@@ -322,6 +340,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
@@ -353,6 +372,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-fe5ce6eb-1b7c-6cd1-2e78-e9f71b0262f1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 334
@@ -362,6 +382,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -387,6 +408,7 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 363
@@ -396,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -430,6 +453,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 400
@@ -439,6 +463,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
@@ -473,6 +498,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-dc7f0df2-c1a1-daeb-6556-1f60f5c4484c
   - license_expression: michigan-disclaimer
+    license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
       - score: '100.0'
         start_line: 440
@@ -482,6 +508,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
         rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
@@ -508,6 +535,7 @@ license_detections:
              IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
     identifier: michigan_disclaimer-f90073dd-2b26-8fe5-d12a-32531681f44a
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 469
@@ -517,6 +545,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -531,6 +560,7 @@ license_detections:
              PURPOSE.
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '100.0'
         start_line: 485
@@ -540,6 +570,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
@@ -565,6 +596,7 @@ license_detections:
              WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
     identifier: mit_no_advert_export_control-d6c84c49-6090-f5cb-35df-480e9ca265bf
   - license_expression: openldap-2.8
+    license_expression_spdx: OLDAP-2.8
     matches:
       - score: '100.0'
         start_line: 511
@@ -574,6 +606,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
         rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
@@ -628,6 +661,7 @@ license_detections:
              distribute verbatim copies of this document is granted.
     identifier: openldap_2_8-58e150c7-83e9-bea6-0075-83fa7a4a9025
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 568
@@ -637,6 +671,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
@@ -671,6 +706,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-3067d87e-03fa-386b-14c5-8c725b58e271
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 608
@@ -680,6 +716,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
@@ -715,6 +752,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-405dd1d5-a75a-5b1c-3698-dad680358560
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 647
@@ -724,6 +762,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
@@ -759,6 +798,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bcd7c498-0b2c-5abe-4ee7-1e4d56c69bcc
   - license_expression: freebsd-doc
+    license_expression_spdx: FreeBSD-DOC
     matches:
       - score: '100.0'
         start_line: 682
@@ -768,6 +808,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
         rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
@@ -798,6 +839,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: freebsd_doc-9db33af1-af77-1b9f-27f4-0ae766439a3a
   - license_expression: cmu-uc
+    license_expression_spdx: MIT-CMU
     matches:
       - score: '99.0'
         start_line: 713
@@ -807,6 +849,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
         rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
@@ -830,6 +873,7 @@ license_detections:
              SOFTWARE.
     identifier: cmu_uc-81218bbc-ee50-f7e2-791a-f18dcff965fd
   - license_expression: nrl-permission
+    license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
       - score: '95.0'
         start_line: 735
@@ -839,6 +883,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
         rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
@@ -854,6 +899,7 @@ license_detections:
              RESULTING FROM THE USE OF THIS SOFTWARE.
     identifier: nrl_permission-69f7eb46-92e8-fb4c-6788-8285e4f7effa
   - license_expression: ietf-trust
+    license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
       - score: '100.0'
         start_line: 752
@@ -863,6 +909,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
         rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
@@ -881,6 +928,7 @@ license_detections:
              PARTICULAR PURPOSE.
     identifier: ietf_trust-f268e8cf-010e-2ddb-9692-832496073cf3
   - license_expression: mit-old-style
+    license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
       - score: '100.0'
         start_line: 769
@@ -890,6 +938,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
         rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
@@ -904,6 +953,7 @@ license_detections:
              warranty.
     identifier: mit_old_style-1e993fd4-e311-4d2f-c751-607871e23414
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 782
@@ -913,6 +963,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -938,6 +989,8 @@ license_detections:
              SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-simplified AND (mit-no-advert-export-control AND proprietary-license)
+    license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
+      AND LicenseRef-scancode-proprietary-license)
     matches:
       - score: '100.0'
         start_line: 810
@@ -947,6 +1000,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -983,6 +1037,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
         rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
@@ -1009,6 +1064,7 @@ license_detections:
              distributor of the ksu software.
     identifier: bsd_simplified_and__mit_no_advert_export_control_and_proprietary_license-345b28a9-f29e-4bc5-6160-59a84fd1aadf
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 866
@@ -1018,6 +1074,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -1058,6 +1115,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: mit-no-advert-export-control
+    license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
       - score: '99.0'
         start_line: 907
@@ -1067,6 +1125,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
         rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
@@ -1089,6 +1148,7 @@ license_detections:
              is" without express or implied warranty.
     identifier: mit_no_advert_export_control-8a3f7c38-f5cb-2016-0e86-70fb9f16ca5c
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 934
@@ -1098,6 +1158,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
@@ -1139,6 +1200,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_original-07212ebb-4bc6-b4e9-de7c-a4d294184c21
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 978
@@ -1148,6 +1210,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_483.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
@@ -1173,6 +1236,7 @@ license_detections:
              OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     identifier: mit-c00d5dad-390d-222f-7182-5d856cf7b8de
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 1004
@@ -1182,6 +1246,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_14.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
@@ -1201,6 +1266,7 @@ license_detections:
              CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-ea6c318e-91a9-413d-027a-507b2cebec2c
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '95.0'
         start_line: 1025
@@ -1210,6 +1276,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_16.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
@@ -1229,6 +1296,7 @@ license_detections:
              this kind of disclaimer?)
     identifier: isc-e2afa98f-2f94-8ed0-73b4-11ad7eb78f27
   - license_expression: other-permissive
+    license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
       - score: '100.0'
         start_line: 1046
@@ -1238,6 +1306,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
         rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
@@ -1246,6 +1315,7 @@ license_detections:
              provided this copyright message remains intact.
     identifier: other_permissive-159ebe90-9eb6-c7d5-9749-3fca97d30548
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1060
@@ -1255,6 +1325,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
@@ -1289,6 +1360,7 @@ license_detections:
              DAMAGE.
     identifier: bsd_new-12f1ac86-ca22-4cc1-70be-ff0581226e16
   - license_expression: rsa-md4
+    license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
       - score: '100.0'
         start_line: 1096
@@ -1298,6 +1370,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
         rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
@@ -1321,6 +1394,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md4-a759e81a-f925-4fa7-feb4-1653e6ac100e
   - license_expression: rsa-md5
+    license_expression_spdx: RSA-MD
     matches:
       - score: '100.0'
         start_line: 1121
@@ -1330,6 +1404,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
         rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
@@ -1353,6 +1428,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_md5-15c129b1-dd57-a1d1-c398-85cc6d20017e
   - license_expression: rsa-1990
+    license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
       - score: '100.0'
         start_line: 1147
@@ -1362,6 +1438,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
         rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
@@ -1375,6 +1452,7 @@ license_detections:
              documentation and/or software.
     identifier: rsa_1990-2041758f-0e05-d693-1067-8e6b055aa3ee
   - license_expression: mit-with-modification-obligations
+    license_expression_spdx: HPND-export-US-modify
     matches:
       - score: '100.0'
         start_line: 1163
@@ -1384,6 +1462,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
         rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
@@ -1409,6 +1488,7 @@ license_detections:
              provided "as is" without express or implied warranty.
     identifier: mit_with_modification_obligations-42eb6af6-0f2c-428f-f892-f4bb7295452c
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1190
@@ -1418,6 +1498,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
@@ -1452,6 +1533,7 @@ license_detections:
              SUCH DAMAGE.
     identifier: bsd_new-92ffce46-c317-d9f5-e740-a98f7d6eb994
   - license_expression: bsd-simplified OR gpl-2.0-plus
+    license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 1226
@@ -1461,6 +1543,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
         rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
@@ -1506,6 +1589,7 @@ license_detections:
              version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: bsd_simplified_or_gpl_2_0_plus-061f1e82-e3fd-1972-4fbc-961626a0b57a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1274
@@ -1515,6 +1599,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
@@ -1550,6 +1635,7 @@ license_detections:
              OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-27fdae2b-970d-afa7-4ecb-ef39abbe9d1e
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 1311
@@ -1559,6 +1645,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
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 888f0ef7b3a..7aaf9bbfbb5 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
@@ -29,6 +29,7 @@ other_license_expression_spdx: BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AN
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 64
@@ -38,6 +39,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -50,6 +52,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
@@ -62,6 +65,7 @@ other_license_detections:
           Public License can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-8f03a209-723a-5338-eac8-e37c880f528d
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 72
@@ -71,6 +75,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -83,6 +88,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_985.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_985.RULE
@@ -96,6 +102,7 @@ other_license_detections:
           Public License can be found in '/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-e081e12a-5320-6d45-b399-2b85f6a41f9a
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 82
@@ -105,6 +112,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
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 b67d914a030..2287b083942 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
@@ -62,6 +62,10 @@ other_license_detections:
   - license_expression: public-domain AND lgpl-2.1-plus AND gpl-2.0-plus AND (public-domain
       AND gpl-2.0-plus AND gpl-3.0-plus) AND (other-permissive AND other-copyleft) AND public-domain-disclaimer
       AND (lgpl-2.1 AND gpl-2.0 AND gpl-3.0)
+    license_expression_spdx: LicenseRef-scancode-public-domain AND LGPL-2.1-or-later AND GPL-2.0-or-later
+      AND (LicenseRef-scancode-public-domain AND GPL-2.0-or-later AND GPL-3.0-or-later) AND
+      (LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft) AND LicenseRef-scancode-public-domain-disclaimer
+      AND (LGPL-2.1-only AND GPL-2.0-only AND GPL-3.0-only)
     matches:
       - score: '100.0'
         start_line: 23
@@ -71,6 +75,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_285.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE
@@ -83,6 +88,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_431.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_431.RULE
@@ -97,6 +103,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_393.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_393.RULE
@@ -111,6 +118,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_991.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_991.RULE
@@ -125,6 +133,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_428.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_428.RULE
@@ -139,6 +148,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_429.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_429.RULE
@@ -151,6 +161,8 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          GPL-3.0-or-later
         rule_identifier: public-domain_and_gpl-2.0-plus_and_gpl-3.0-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_and_gpl-2.0-plus_and_gpl-3.0-plus_1.RULE
@@ -165,6 +177,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_305.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_305.RULE
@@ -177,6 +190,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
@@ -189,6 +203,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: other-permissive AND other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
         rule_identifier: other-permissive_and_other-copyleft_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_other-copyleft_4.RULE
@@ -203,6 +218,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_72.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_72.RULE
@@ -230,6 +246,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.1_and_gpl-2.0_and_gpl-3.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_and_gpl-2.0_and_gpl-3.0_3.RULE
@@ -246,6 +263,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_427.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_427.RULE
@@ -258,12 +276,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_430.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_430.RULE
         matched_text: Most of the source has been put into the public domain,
     identifier: public_domain_and_lgpl_2_1_plus_and_gpl_2_0_plus_and__public_domain_and_gpl_2_0_plus_and_gpl_3_0_plus__and__other_permissive_and_other_copyleft__and_public_domain_disclaimer_and__lgpl_2_1_and_gpl_2_0_and_gpl_3_0-4691a091-f632-d529-3371-6ce2e75116fe
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 90
@@ -273,6 +293,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_353.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_353.RULE
@@ -281,6 +302,7 @@ other_license_detections:
           You can do whatever you want with this file.
     identifier: public_domain-4bce4f5f-c6ad-3c6f-1b23-ccc9a7d286e8
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '55.0'
         start_line: 120
@@ -290,12 +312,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_356.RULE
         rule_relevance: 55
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_356.RULE
         matched_text: See the note on AUTHORS, README, and so on above.
     identifier: public_domain-2edfee4d-b020-5521-fa21-9f147003edee
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 136
@@ -305,6 +329,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_353.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_353.RULE
@@ -313,6 +338,7 @@ other_license_detections:
           You can do whatever you want with this file.
     identifier: public_domain-4bce4f5f-c6ad-3c6f-1b23-ccc9a7d286e8
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 142
@@ -322,12 +348,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_219.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_219.RULE
         matched_text: Not copyrighted -- provided to the public domain.
     identifier: public_domain-343d857e-4460-3363-2dc0-930ea3e9e84b
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 180
@@ -337,12 +365,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_355.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_355.RULE
         matched_text: No copyright to license.
     identifier: public_domain-7b6ed7b8-456a-38b3-d0e8-9234afee9fbe
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 185
@@ -352,12 +382,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_355.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_355.RULE
         matched_text: No copyright to license.
     identifier: public_domain-7b6ed7b8-456a-38b3-d0e8-9234afee9fbe
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: '191'
@@ -367,6 +399,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_47.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_47.RULE
@@ -375,6 +408,7 @@ other_license_detections:
           You can do whatever you want with this file.
     identifier: public_domain-bd7fd269-2ea9-ba97-d2eb-5560087fd9b5
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 209
@@ -384,12 +418,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_66.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_66.RULE
         matched_text: This file is put in the public domain.
     identifier: public_domain-988843f6-19e0-bdd4-e2c1-d0a899c8f5f7
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 217
@@ -399,12 +435,15 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_50.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_50.RULE
         matched_text: This file is in the public domain
     identifier: public_domain-4b02eb33-5304-7130-8eb0-364fc26686a6
   - license_expression: public-domain AND fsf-unlimited AND autoconf-exception-2.0 AND gpl-2.0
+    license_expression_spdx: LicenseRef-scancode-public-domain AND FSFULLR AND Autoconf-exception-2.0
+      AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 238
@@ -414,6 +453,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_47.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_47.RULE
@@ -428,6 +468,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -443,6 +484,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: autoconf-exception-2.0
+        spdx_license_expression: Autoconf-exception-2.0
         rule_identifier: gpl-2.0-plus_with_autoconf-exception-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-exception-2.0_2.RULE
@@ -462,6 +504,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
@@ -470,6 +513,7 @@ other_license_detections:
           License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: public_domain_and_fsf_unlimited_and_autoconf_exception_2_0_and_gpl_2_0-dc221484-4ce9-5ad0-a511-a12eea6f2df6
   - license_expression: lgpl-2.1-plus AND (lgpl-2.0 AND lgpl-2.1)
+    license_expression_spdx: LGPL-2.1-or-later AND (LGPL-2.0-only AND LGPL-2.1-only)
     matches:
       - score: '100.0'
         start_line: 274
@@ -479,6 +523,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -491,6 +536,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: lgpl-2.0 AND lgpl-2.1
+        spdx_license_expression: LGPL-2.0-only AND LGPL-2.1-only
         rule_identifier: lgpl-2.0_and_lgpl-2.1_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_lgpl-2.1_1.RULE
@@ -504,6 +550,7 @@ other_license_detections:
           ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus_and__lgpl_2_0_and_lgpl_2_1-2e73c0f0-b775-345b-2105-b006c3409499
   - license_expression: other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
       - score: '90.0'
         start_line: 289
@@ -513,6 +560,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
         rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
@@ -521,6 +569,7 @@ other_license_detections:
           of this license document, but changing it is not allowed.
     identifier: other_copyleft-0ac0d4dd-1063-c305-80e8-d67a64a53eaf
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 295
@@ -530,6 +579,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_360.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_360.RULE
@@ -538,6 +588,7 @@ other_license_detections:
           You may freely use, modify, distribute, and relicense them.
     identifier: public_domain-737fabda-edbb-94c3-caeb-6f8892c4916b
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 298
@@ -547,6 +598,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -559,6 +611,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -581,6 +634,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 316
@@ -590,6 +644,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -602,6 +657,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1302.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1302.RULE
@@ -621,6 +677,7 @@ other_license_detections:
           ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0-aaecf2d3-068e-1d30-3b70-ef8d0ecc7b7f
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 331
@@ -630,6 +687,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -642,6 +700,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -664,6 +723,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: gpl-3.0-plus WITH autoconf-macro-exception
+    license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-macro
     matches:
       - score: '100.0'
         start_line: 350
@@ -673,6 +733,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH autoconf-macro-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-macro
         rule_identifier: gpl-3.0-plus_with_autoconf-macro-exception_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-macro-exception_6.RULE
@@ -707,6 +768,7 @@ other_license_detections:
           License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’.
     identifier: gpl_3_0_plus_with_autoconf_macro_exception-a2877901-0b39-4e89-5b10-f1884d45352e
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 380
@@ -716,6 +778,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -725,6 +788,7 @@ other_license_detections:
           with or without modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-ed3d6762-95f0-131d-94c5-834f10d192a2
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 385
@@ -734,6 +798,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
@@ -744,6 +809,7 @@ other_license_detections:
           without warranty of any kind.
     identifier: fsf_ap-6e2950ec-5e19-6eae-7b74-d4a2741381b9
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 12
@@ -753,12 +819,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_430.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_430.RULE
         matched_text: Most of the source has been put into the public domain,
     identifier: public_domain-be741e60-3c47-76c0-ca1d-9ba13449e98a
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 104
@@ -768,6 +836,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_473.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_473.RULE
@@ -780,6 +849,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_473.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_473.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 f33b7b4432a..48a1156afa9 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
@@ -194,6 +194,7 @@ other_license_expression_spdx: ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GP
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 276
@@ -203,6 +204,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -215,6 +217,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_460.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_460.RULE
@@ -238,6 +241,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL-2.
     identifier: lgpl_2_0_plus-974dd354-ef44-944d-ffbb-69b6be081731
   - license_expression: gpl-3.0-plus AND gpl-3.0-plus WITH tex-exception
+    license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception
     matches:
       - score: '100.0'
         start_line: 489
@@ -247,6 +251,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -259,6 +264,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH tex-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
         rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_tex-exception_5.RULE
@@ -281,6 +287,7 @@ other_license_detections:
           restriction.  (This has been our intent since Texinfo was invented.)
     identifier: gpl_3_0_plus_and_gpl_3_0_plus_with_tex_exception-71564435-9876-cce5-4982-7b2b76b00f2e
   - license_expression: autoconf-simple-exception-2.0
+    license_expression_spdx: Autoconf-exception-generic
     matches:
       - score: '100.0'
         start_line: 525
@@ -290,6 +297,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
         rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
@@ -300,6 +308,7 @@ other_license_detections:
           the same distribution terms that you use for the rest of that program.
     identifier: autoconf_simple_exception_2_0-9f49705d-f825-5107-3217-345df57f18c4
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 533
@@ -309,6 +318,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_354.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_354.RULE
@@ -317,6 +327,7 @@ other_license_detections:
           expression eligible for copyright.
     identifier: public_domain-08996397-ee56-6ff8-8fb7-35f9f0b96837
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 539
@@ -326,6 +337,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -338,6 +350,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1155.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1155.RULE
@@ -361,6 +374,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0-b47eb271-c5ef-bd9e-ddea-7766c795aa06
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 565
@@ -370,6 +384,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_3.RULE
@@ -379,6 +394,7 @@ other_license_detections:
           notice and this notice are preserved.
     identifier: fsf_ap-e6bce55e-c5a1-cd3c-4dee-8eea6cc9bbe3
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 569
@@ -388,6 +404,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -400,6 +417,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_196.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_196.RULE
@@ -422,6 +440,7 @@ other_license_detections:
           /usr/share/common-licenses/LGPL.
     identifier: lgpl_3_0_plus-4223bfa7-54f8-4a73-f2df-0e6a63fd31a5
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 587
@@ -431,6 +450,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -443,6 +463,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_857.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_857.RULE
@@ -467,6 +488,7 @@ other_license_detections:
           /usr/share/common-licenses/GPL.
     identifier: gpl_2_0_plus-efe6b372-1df6-a999-a97e-2bc9e6ec9898
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 608
@@ -476,6 +498,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -501,6 +524,9 @@ other_license_detections:
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: ((gpl-2.0-plus OR gpl-3.0-plus) AND other-permissive AND public-domain)
       AND public-domain AND lgpl-2.0-plus AND mit AND pycrypto AND lgpl-2.1-plus
+    license_expression_spdx: ((GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive
+      AND LicenseRef-scancode-public-domain) AND LicenseRef-scancode-public-domain AND LGPL-2.0-or-later
+      AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 10
@@ -510,6 +536,8 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          AND LicenseRef-scancode-public-domain
         rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
@@ -529,6 +557,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -541,6 +570,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_515.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_515.RULE
@@ -553,6 +583,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_1090.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1090.RULE
@@ -565,6 +596,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pycrypto
+        spdx_license_expression: LicenseRef-scancode-pycrypto
         rule_identifier: pycrypto_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pycrypto_1.RULE
@@ -579,6 +611,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -591,6 +624,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -603,6 +637,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
@@ -617,6 +652,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_425.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_425.RULE
@@ -629,6 +665,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
@@ -643,6 +680,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE
@@ -655,6 +693,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_465.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_465.RULE
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 53609ade9ee..76810a5d4d6 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
@@ -39,6 +39,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 171
@@ -48,6 +49,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
@@ -80,6 +82,7 @@ license_detections:
             OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-ac94609c-944a-f9a1-4cff-f58b845098a0
   - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
+    license_expression_spdx: GPL-2.0-or-later WITH Autoconf-exception-generic
     matches:
       - score: '100.0'
         start_line: '199'
@@ -89,6 +92,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
         rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_16.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-simple-exception-2.0_16.RULE
@@ -115,6 +119,7 @@ license_detections:
           version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_with_autoconf_simple_exception_2_0-a61a1123-4a91-29fe-f86c-06db7b1208df
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+    license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception
     matches:
       - score: '100.0'
         start_line: 221
@@ -124,6 +129,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
         rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_17.RULE
@@ -150,6 +156,7 @@ license_detections:
           version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_with_libtool_exception_2_0-c4669be3-4e50-9924-e80b-2a4ebee07dec
   - license_expression: gpl-3.0-plus WITH autoconf-simple-exception
+    license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
     matches:
       - score: '100.0'
         start_line: 243
@@ -159,6 +166,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH autoconf-simple-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
         rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_6.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-simple-exception_6.RULE
@@ -187,6 +195,7 @@ license_detections:
           Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus_with_autoconf_simple_exception-6756a4a1-65da-4388-3f23-465053561382
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 266
@@ -196,6 +205,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -208,6 +218,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_369.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_369.RULE
@@ -228,6 +239,7 @@ license_detections:
           License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
     identifier: lgpl_2_1-af00f224-7cdc-f157-5516-90a5799b4be1
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 282
@@ -237,6 +249,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -249,6 +262,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_387.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_387.RULE
@@ -271,6 +285,7 @@ license_detections:
           License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
     identifier: lgpl_2_1_plus-f466018a-eac5-e44c-e9ea-68075d3fe9ae
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 301
@@ -280,6 +295,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -307,6 +323,7 @@ license_detections:
           tium.
     identifier: x11_xconsortium-8bc3e205-5f29-ecad-90bc-2f492c65be46
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 324
@@ -316,6 +333,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -325,6 +343,7 @@ license_detections:
           modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-ed3d6762-95f0-131d-94c5-834f10d192a2
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 329
@@ -334,6 +353,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
@@ -348,6 +368,7 @@ license_detections:
           PARTICULAR PURPOSE.
     identifier: fsf_unlimited_no_warranty-0823c9f0-6e4b-8cf0-64e1-5165a09dfa45
   - license_expression: fsf-free
+    license_expression_spdx: FSFUL
     matches:
       - score: '100.0'
         start_line: 339
@@ -357,6 +378,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-free
+        spdx_license_expression: FSFUL
         rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
@@ -365,6 +387,7 @@ license_detections:
           gives unlimited permission to copy, distribute and modify it.
     identifier: fsf_free-95bff5c5-ed9b-1c78-0dd8-4c05168176ba
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 343
@@ -374,6 +397,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
@@ -384,6 +408,7 @@ license_detections:
           without any warranty.
     identifier: fsf_ap-a7d380d0-4462-458a-36c1-1852bdcbf538
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 349
@@ -393,6 +418,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty_2.RULE
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 ef3803a85a2..0d434836658 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
@@ -24,6 +24,7 @@ other_license_expression_spdx: BSD-3-Clause AND FSFULLRWD AND BSD-3-Clause AND B
 license_detections: []
 other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
+    license_expression_spdx: FSFULLRWD
     matches:
       - score: '100.0'
         start_line: 17
@@ -33,6 +34,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
         rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
@@ -47,6 +49,7 @@ other_license_detections:
             PURPOSE.  */
     identifier: fsf_unlimited_no_warranty-005cbd82-97e0-5c6c-e111-cd46d95d2c5a
   - license_expression: isc
+    license_expression_spdx: ISC
     matches:
       - score: '100.0'
         start_line: 61
@@ -56,6 +59,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_20.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_20.RULE
@@ -73,6 +77,7 @@ other_license_detections:
           PERFORMANCE OF THIS SOFTWARE.
     identifier: isc-027c5afe-e7fe-a7fe-149e-fdcae05e6c2e
   - license_expression: isc AND ibm-dhcp
+    license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp
     matches:
       - score: '100.0'
         start_line: 80
@@ -82,6 +87,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: isc
+        spdx_license_expression: ISC
         rule_identifier: isc_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
@@ -106,6 +112,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
         rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
@@ -132,6 +139,7 @@ other_license_detections:
           IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
     identifier: isc_and_ibm_dhcp-d539ba65-a2a0-2bb1-a2a4-c389ed251972
   - license_expression: free-unknown
+    license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
       - score: '100.0'
         start_line: 160
@@ -141,12 +149,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
         rule_identifier: free-unknown-package_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE
         matched_text: This file is distributed under the same license as the
     identifier: free_unknown-fddf748a-9953-bc6c-cb9d-91001840e335
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 165
@@ -156,6 +166,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -185,6 +196,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '80.0'
         start_line: 46
@@ -194,6 +206,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit_17.RULE
         rule_relevance: 80
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_17.RULE
@@ -210,6 +223,7 @@ other_license_detections:
           * included in all copies or substantial portions of the Software.
     identifier: mit-19e92631-4a50-0b43-f7f7-3c6b7d44ec18
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 151
@@ -219,6 +233,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1043.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1043.RULE
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 e8168274afc..2208293c64c 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: (bsd-new OR lgpl-2.0-plus) AND gpl-1.0-plus
+    license_expression_spdx: (BSD-3-Clause OR LGPL-2.0-or-later) AND GPL-1.0-or-later
     matches:
       - score: '98.6'
         start_line: 25
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: bsd-new OR lgpl-2.0-plus
+        spdx_license_expression: BSD-3-Clause OR LGPL-2.0-or-later
         rule_identifier: bsd-new_or_lgpl-2.0-plus_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_lgpl-2.0-plus_4.RULE
@@ -65,6 +67,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_10.RULE
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 a08fb988052..ce84ffe636d 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: pcre
+    license_expression_spdx: LicenseRef-scancode-pcre
     matches:
       - score: '100.0'
         start_line: 3
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
         rule_identifier: pcre_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_7.RULE
@@ -24,6 +26,7 @@ license_detections:
           PCRE2 LICENCE
     identifier: pcre-90b147d9-f7f6-9673-6313-9d0c919c9d91
   - license_expression: bsd-new AND public-domain
+    license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 11
@@ -33,6 +36,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_398.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_398.RULE
@@ -45,12 +49,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_328.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_328.RULE
         matched_text: not copyrighted and is in the public domain.
     identifier: bsd_new_and_public_domain-e977518e-26ee-d19e-0b06-9fb80190cefe
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '99.0'
         start_line: 58
@@ -60,6 +66,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_898.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_898.RULE
@@ -72,6 +79,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1064.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1064.RULE
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 578b879f852..0dabfeb6d5d 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: pcre
+    license_expression_spdx: LicenseRef-scancode-pcre
     matches:
       - score: '100.0'
         start_line: 7
@@ -14,12 +15,14 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
         rule_identifier: pcre_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_4.RULE
         matched_text: PCRE LICENCE
     identifier: pcre-b7d0af79-af3f-24dc-6a31-2df791031f14
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 13
@@ -29,6 +32,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_645.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_645.RULE
@@ -38,6 +42,7 @@ license_detections:
           directory, is distributed under the same terms as the software itself.
     identifier: bsd_new-b0c1a29e-cb77-763e-cf87-1a54fced2cf1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 44
@@ -47,6 +52,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1105.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1105.RULE
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 1d0b1c2d5b5..111e4f4f6d7 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
@@ -13,6 +13,7 @@ other_license_expression_spdx: (LGPL-2.1-only AND LGPL-2.1-only) AND (LGPL-2.1-o
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 25
@@ -22,6 +23,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -34,6 +36,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_368.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_368.RULE
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 ac4a37cbc17..c2d8b534c30 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
@@ -6,6 +6,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: selinux-nsa-declaration-1.0
+    license_expression_spdx: libselinux-1.0
     matches:
       - score: '100.0'
         start_line: 7
@@ -15,6 +16,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: selinux-nsa-declaration-1.0
+        spdx_license_expression: libselinux-1.0
         rule_identifier: selinux-nsa-declaration-1.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/selinux-nsa-declaration-1.0.LICENSE
@@ -42,6 +44,7 @@ license_detections:
           risk.
     identifier: selinux_nsa_declaration_1_0-845d7cb4-a2eb-f401-8cd9-df047578f86c
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 32
@@ -51,6 +54,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_929.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_929.RULE
@@ -59,6 +63,7 @@ license_detections:
            version 2.
     identifier: gpl_2_0-a2bdb57d-a203-65c0-fbb7-26a774d0b947
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 38
@@ -68,6 +73,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_384.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_384.RULE
@@ -87,6 +93,7 @@ license_detections:
           General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-87de33d2-cbcd-42e9-9876-2f1e5c016188
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 56
@@ -96,6 +103,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_930.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_930.RULE
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 b0a2623f449..ee5c4bd16ec 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 7
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_385.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_385.RULE
@@ -36,6 +38,7 @@ license_detections:
           Public License can be found in `/usr/share/common-licenses/LGPL'.
     identifier: lgpl_2_1_plus-358c2e4e-317d-a900-9a89-87548f33525d
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 27
@@ -45,6 +48,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1123.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1123.RULE
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 828c77b386f..e94e5e36dda 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-2.0
+    license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-only
     matches:
       - score: '89.63'
         start_line: 16
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '89.63'
         matcher: 3-seq
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_312.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_312.RULE
@@ -52,6 +54,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1123.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1123.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 652a6d27422..9b432b2a096 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: mit-old-style-no-advert
+    license_expression_spdx: NTP
     matches:
       - score: '100.0'
         start_line: 15
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
         rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
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 f02c66df17b..b9643c01681 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: openssl-ssleay
+    license_expression_spdx: OpenSSL
     matches:
       - score: '99.89'
         start_line: 10
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '99.89'
         matcher: 3-seq
         license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
         rule_identifier: openssl-ssleay_37.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_37.RULE
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 f3134d8276a..4c1223a5010 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
@@ -27,6 +27,7 @@ other_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (CC
 license_detections: []
 other_license_detections:
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 77
@@ -36,6 +37,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
@@ -44,6 +46,7 @@ other_license_detections:
           warranty.
     identifier: public_domain_disclaimer-8e235ed9-5a49-0bba-be41-0bb35f0779c9
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 150
@@ -53,6 +56,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -76,6 +80,7 @@ other_license_detections:
           IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 168
@@ -85,6 +90,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -97,6 +103,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
@@ -119,6 +126,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2`
     identifier: gpl_2_0-0acbb9ac-a862-7099-0f33-caefbf2d141b
   - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+    license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note
     matches:
       - score: '100.0'
         start_line: 187
@@ -128,6 +136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
         rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
@@ -163,6 +172,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2`
     identifier: gpl_2_0_with_linux_syscall_exception_gpl-1465edb5-6e2a-792a-cbbe-8a910dd31c7c
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 217
@@ -172,6 +182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -184,6 +195,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -206,6 +218,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 235
@@ -215,6 +228,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -227,6 +241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -249,6 +264,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 253
@@ -258,6 +274,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -270,6 +287,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
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 d12600b57f7..c0c25d29ae9 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-3.0-plus
+    license_expression_spdx: LGPL-2.1-or-later AND GPL-3.0-or-later
     matches:
       - score: '95.45'
         start_line: 14
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-3.0-plus_2.RULE
@@ -24,6 +26,7 @@ license_detections:
           command-line tools (package libtasn1-bin) are GPLv3+.
     identifier: lgpl_2_1_plus_and_gpl_3_0_plus-ba011866-8d3a-d5ce-dfbe-68a1d5f8302e
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '99.39'
         start_line: 23
@@ -33,6 +36,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_312.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_312.RULE
@@ -59,6 +63,7 @@ license_detections:
           of the license (2.1) can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-9c41e5e7-72ec-2448-df2b-424137a5b9fc
   - license_expression: gpl-3.0-plus AND gfdl-1.3 AND gfdl-1.3-plus
+    license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-only AND GFDL-1.3-or-later
     matches:
       - score: '85.91'
         start_line: 50
@@ -68,6 +73,7 @@ license_detections:
         match_coverage: '85.91'
         matcher: 3-seq
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_417.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_417.RULE
@@ -101,6 +107,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3
+        spdx_license_expression: GFDL-1.3-only
         rule_identifier: gfdl-1.3_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3_8.RULE
@@ -115,6 +122,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_25.RULE
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 efa5f73f314..d262d88bc71 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
@@ -12,6 +12,7 @@ other_license_expression_spdx: X11-distribute-modifications-variant AND X11 AND
 license_detections: []
 other_license_detections:
   - license_expression: x11-fsf
+    license_expression_spdx: X11-distribute-modifications-variant
     matches:
       - score: '100.0'
         start_line: 22
@@ -21,6 +22,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
         rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
@@ -50,6 +52,7 @@ other_license_detections:
           authorization.
     identifier: x11_fsf-5f3d72c2-fa6a-2f7b-b859-17e7567c1724
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 47
@@ -59,6 +62,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -86,6 +90,7 @@ other_license_detections:
           tium.
     identifier: x11_xconsortium-8bc3e205-5f29-ecad-90bc-2f492c65be46
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 70
@@ -95,6 +100,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
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 9b2865d645e..bf7a91b8708 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
@@ -59,6 +59,7 @@ other_license_expression_spdx: BSD-3-Clause AND (GPL-2.0-only AND GPL-2.0-only)
 license_detections: []
 other_license_detections:
   - license_expression: other-permissive AND free-unknown
+    license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown
     matches:
       - score: '20.0'
         start_line: 105
@@ -68,12 +69,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-permissive AND free-unknown
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown
         rule_identifier: other-permissive_and_free-unknown_2.RULE
         rule_relevance: 20
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_free-unknown_2.RULE
         matched_text: Autogenerated files with permissive licenses.
     identifier: other_permissive_and_free_unknown-27992f80-dbd8-9f3b-dff9-6668e7755e87
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 164
@@ -83,6 +86,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
@@ -93,6 +97,7 @@ other_license_detections:
           without warranty of any kind.
     identifier: fsf_ap-6e2950ec-5e19-6eae-7b74-d4a2741381b9
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 268
@@ -102,6 +107,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_232.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_232.RULE
@@ -130,6 +136,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-62d6d00f-e294-8c51-b9fd-49c538dab704
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 292
@@ -139,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
@@ -165,6 +173,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified-24fb2214-fe65-fd01-a4db-75b7cf8d710c
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '100.0'
         start_line: 314
@@ -174,6 +183,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_73.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_73.RULE
@@ -206,6 +216,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original-ffd27aa7-cc91-73e6-a26b-33d54d6ce704
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 341
@@ -215,6 +226,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -227,6 +239,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_386.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_386.RULE
@@ -240,6 +253,7 @@ other_license_detections:
           Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus-8f614c1b-3863-2a23-eef2-e2645bc5ef8a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -249,6 +263,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -261,6 +276,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
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 f3134d8276a..4c1223a5010 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
@@ -27,6 +27,7 @@ other_license_expression_spdx: (LGPL-2.1-or-later AND LGPL-2.1-or-later) AND (CC
 license_detections: []
 other_license_detections:
   - license_expression: public-domain-disclaimer
+    license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 77
@@ -36,6 +37,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
@@ -44,6 +46,7 @@ other_license_detections:
           warranty.
     identifier: public_domain_disclaimer-8e235ed9-5a49-0bba-be41-0bb35f0779c9
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 150
@@ -53,6 +56,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -76,6 +80,7 @@ other_license_detections:
           IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 168
@@ -85,6 +90,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -97,6 +103,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
@@ -119,6 +126,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2`
     identifier: gpl_2_0-0acbb9ac-a862-7099-0f33-caefbf2d141b
   - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+    license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note
     matches:
       - score: '100.0'
         start_line: 187
@@ -128,6 +136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
         rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
@@ -163,6 +172,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2`
     identifier: gpl_2_0_with_linux_syscall_exception_gpl-1465edb5-6e2a-792a-cbbe-8a910dd31c7c
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 217
@@ -172,6 +182,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -184,6 +195,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
@@ -206,6 +218,7 @@ other_license_detections:
           version 2 can be found in ‘/usr/share/common-licenses/GPL-2’.
     identifier: gpl_2_0_plus-b1b987d4-03d4-5eb8-154c-7c270ba63c44
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 235
@@ -215,6 +228,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -227,6 +241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -249,6 +264,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 253
@@ -258,6 +274,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -270,6 +287,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
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 ba367830aa4..e8b61149e74 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
@@ -28,6 +28,7 @@ other_license_expression_spdx: ((LGPL-3.0-or-later AND LGPL-3.0-or-later) OR (GP
 license_detections: []
 other_license_detections:
   - license_expression: fsf-unlimited
+    license_expression_spdx: FSFULLR
     matches:
       - score: '100.0'
         start_line: 13
@@ -37,6 +38,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
         rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
@@ -46,6 +48,7 @@ other_license_detections:
           with or without modifications, as long as this notice is preserved.
     identifier: fsf_unlimited-ed3d6762-95f0-131d-94c5-834f10d192a2
   - license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0
+    license_expression_spdx: GPL-1.0-or-later WITH Autoconf-exception-generic
     matches:
       - score: '100.0'
         start_line: 21
@@ -55,6 +58,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-1.0-or-later WITH Autoconf-exception-generic
         rule_identifier: gpl-1.0-plus_with_autoconf-simple-exception-2.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_with_autoconf-simple-exception-2.0_2.RULE
@@ -66,6 +70,7 @@ other_license_detections:
           the same distribution terms as the rest of that program.
     identifier: gpl_1_0_plus_with_autoconf_simple_exception_2_0-6a19dac0-e138-7f0e-ca21-89dc117a7e0f
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 54
@@ -75,6 +80,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -87,6 +93,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_244.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_244.RULE
@@ -109,6 +116,7 @@ other_license_detections:
           `/usr/share/common-licenses/LGPL-3'.
     identifier: lgpl_3_0_plus-d7b6c887-6211-0903-f8ad-e6e5dc712314
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 72
@@ -118,6 +126,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -130,6 +139,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_484.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_484.RULE
@@ -152,6 +162,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-e01996f2-fa09-b18f-a191-a739321c386b
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 90
@@ -161,6 +172,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -173,6 +185,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_990.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_990.RULE
@@ -197,6 +210,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-fcabb036-b3ee-63af-5c15-3fe810c2496c
   - license_expression: gfdl-1.2-plus
+    license_expression_spdx: GFDL-1.2-or-later
     matches:
       - score: '100.0'
         start_line: 110
@@ -206,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
         rule_identifier: debian_common_gfdl-1.2-plus.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/debian_common_gfdl-1.2-plus.RULE
@@ -218,6 +233,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
         rule_identifier: gfdl-1.2-plus_21.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2-plus_21.RULE
@@ -234,6 +250,7 @@ other_license_detections:
           `/usr/share/common-licenses/GFDL-1.2'.
     identifier: gfdl_1_2_plus-f62b1529-66dc-7c29-62a0-2cfdedf5195d
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 123
@@ -243,6 +260,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 a1d7655061e..a28d0c82a05 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
@@ -12,6 +12,7 @@ other_license_expression_spdx: BSD-2-Clause AND (GPL-2.0-only AND GPL-2.0-or-lat
 license_detections: []
 other_license_detections:
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 20
@@ -21,6 +22,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
@@ -47,6 +49,7 @@ other_license_detections:
           SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_simplified-a1deb97f-56cd-71ea-a95f-82477d400503
   - license_expression: gpl-2.0 AND gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-only AND GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 41
@@ -56,6 +59,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -68,6 +72,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_984.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_984.RULE
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 690de1100d4..d2cb4cd7b3c 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
@@ -18,6 +18,7 @@ other_license_expression_spdx: (BSD-3-Clause AND (GPL-2.0-only AND GPL-2.0-only)
 license_detections: []
 other_license_detections:
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 30
@@ -27,6 +28,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_81.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_81.RULE
@@ -48,6 +50,7 @@ other_license_detections:
           3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-9a572338-50f0-922a-4ff5-942f61bbd11b
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 59
@@ -57,6 +60,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -82,6 +86,7 @@ other_license_detections:
           SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 79
@@ -91,6 +96,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -103,6 +109,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -124,6 +131,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 97
@@ -133,6 +141,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1273.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1273.RULE
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 6721be0009d..0744fec881d 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '97.18'
         start_line: 20
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_67.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_67.RULE
@@ -43,6 +45,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-44167a67-f95e-380d-3fbb-e5be5e832c48
   - license_expression: tcp-wrappers
+    license_expression_spdx: TCP-wrappers
     matches:
       - score: '100.0'
         start_line: 72
@@ -52,6 +55,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: tcp-wrappers
+        spdx_license_expression: TCP-wrappers
         rule_identifier: tcp-wrappers_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcp-wrappers_3.RULE
@@ -65,6 +69,7 @@ license_detections:
           \ of\n* merchantibility and fitness for any particular purpose."
     identifier: tcp_wrappers-47a49a2d-71d2-76d4-0780-2d5c538898f7
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 92
@@ -74,6 +79,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_749.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_749.RULE
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 2783592c4b5..dd8da3c19f6 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
@@ -7,6 +7,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
+    license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
       - score: '99.02'
         start_line: 17
@@ -16,6 +17,7 @@ license_detections:
         match_coverage: '99.02'
         matcher: 3-seq
         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
         rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
@@ -30,6 +32,7 @@ license_detections:
           \  The\ncomplete text of the GNU Library General Public License can be found\nin '/usr/share/common-licenses/LGPL-2'."
     identifier: gpl_2_0_and_lgpl_2_0_and_bsd_new_and_mit_old_style_no_advert-aed55561-0504-0265-5986-832cc7f7bbf2
   - license_expression: ntp-0 AND bsd-new
+    license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 38
@@ -39,6 +42,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: ntp-0
+        spdx_license_expression: NTP-0
         rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
@@ -59,6 +63,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
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 feffc3b3288..59966837990 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
@@ -11,6 +11,7 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND (GPL-2.0-only
 license_detections: []
 other_license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 15
@@ -20,6 +21,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1069.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1069.RULE
@@ -49,6 +51,7 @@ other_license_detections:
           IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-654c38c8-5c40-9a2f-451b-190141ab0a77
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 39
@@ -58,6 +61,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -70,6 +74,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1301.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1301.RULE
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 a17dd9f064f..3aa3c3ee899 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '99.18'
         start_line: '19'
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1030.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1030.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 efa5f73f314..d262d88bc71 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
@@ -12,6 +12,7 @@ other_license_expression_spdx: X11-distribute-modifications-variant AND X11 AND
 license_detections: []
 other_license_detections:
   - license_expression: x11-fsf
+    license_expression_spdx: X11-distribute-modifications-variant
     matches:
       - score: '100.0'
         start_line: 22
@@ -21,6 +22,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
         rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
@@ -50,6 +52,7 @@ other_license_detections:
           authorization.
     identifier: x11_fsf-5f3d72c2-fa6a-2f7b-b859-17e7567c1724
   - license_expression: x11-xconsortium
+    license_expression_spdx: X11
     matches:
       - score: '100.0'
         start_line: 47
@@ -59,6 +62,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: x11-xconsortium
+        spdx_license_expression: X11
         rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
@@ -86,6 +90,7 @@ other_license_detections:
           tium.
     identifier: x11_xconsortium-8bc3e205-5f29-ecad-90bc-2f492c65be46
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 70
@@ -95,6 +100,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
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 6721be0009d..0744fec881d 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '97.18'
         start_line: 20
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 3-seq
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_67.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_67.RULE
@@ -43,6 +45,7 @@ license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-44167a67-f95e-380d-3fbb-e5be5e832c48
   - license_expression: tcp-wrappers
+    license_expression_spdx: TCP-wrappers
     matches:
       - score: '100.0'
         start_line: 72
@@ -52,6 +55,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: tcp-wrappers
+        spdx_license_expression: TCP-wrappers
         rule_identifier: tcp-wrappers_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcp-wrappers_3.RULE
@@ -65,6 +69,7 @@ license_detections:
           \ of\n* merchantibility and fitness for any particular purpose."
     identifier: tcp_wrappers-47a49a2d-71d2-76d4-0780-2d5c538898f7
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 92
@@ -74,6 +79,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_749.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_749.RULE
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 094d8babb87..49d91a2eb50 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
@@ -701,6 +701,7 @@ other_license_expression_spdx: ((GPL-1.0-or-later AND GPL-1.0-only) OR (Artistic
 license_detections: []
 other_license_detections:
   - license_expression: lgpl-2.1
+    license_expression_spdx: LGPL-2.1-only
     matches:
       - score: '100.0'
         start_line: 2025
@@ -710,6 +711,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE
@@ -722,6 +724,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
         rule_identifier: lgpl-2.1_249.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_249.RULE
@@ -730,6 +733,7 @@ other_license_detections:
           license can be found in `/usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1-25729df7-c7a2-c465-4e3a-95c8bbfa2166
   - license_expression: gpl-1.0-plus AND gpl-1.0
+    license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
       - score: '100.0'
         start_line: 2029
@@ -739,6 +743,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
         rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE
@@ -751,6 +756,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
         rule_identifier: gpl-1.0_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_38.RULE
@@ -759,6 +765,7 @@ other_license_detections:
           Public License can be found in `/usr/share/common-licenses/GPL-1'.
     identifier: gpl_1_0_plus_and_gpl_1_0-6a152a01-a4b1-59a8-bc68-c255f8f729e1
   - license_expression: gpl-2.0-plus AND gpl-2.0
+    license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 2033
@@ -768,6 +775,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -780,6 +788,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1040.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1040.RULE
@@ -789,6 +798,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus_and_gpl_2_0-592736dd-25b8-8a93-9c9d-661b18b9e615
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 2038
@@ -798,6 +808,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
@@ -810,6 +821,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_2.RULE
@@ -818,6 +830,7 @@ other_license_detections:
           Artistic Licence can be found in `/usr/share/common-licenses/Artistic'.
     identifier: artistic_perl_1_0-28364b45-8110-28fe-aee5-cb6a37853295
   - license_expression: artistic-2.0
+    license_expression_spdx: Artistic-2.0
     matches:
       - score: '100.0'
         start_line: 2043
@@ -827,6 +840,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
         rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
@@ -1015,6 +1029,7 @@ other_license_detections:
           OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: artistic_2_0-bc78b6a9-7dba-285f-7e81-1b30d7b5e445
   - license_expression: bzip2-libbzip-2010
+    license_expression_spdx: bzip2-1.0.6
     matches:
       - score: '100.0'
         start_line: 2227
@@ -1024,6 +1039,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
         rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
@@ -1060,6 +1076,7 @@ other_license_detections:
            SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bzip2_libbzip_2010-72b4db44-6142-9aeb-acd2-1d8f2447148c
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 2262
@@ -1069,6 +1086,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
@@ -1090,6 +1108,7 @@ other_license_detections:
            3. This notice may not be removed or altered from any source distribution.
     identifier: zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 2279
@@ -1099,6 +1118,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
@@ -1122,6 +1142,7 @@ other_license_detections:
           DEALINGS IN THE SOFTWARE.
     identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2298
@@ -1131,6 +1152,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
@@ -1160,6 +1182,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-fe71ef21-9657-e8d8-ad75-ddd776ac9710
   - license_expression: bsd-original
+    license_expression_spdx: BSD-4-Clause
     matches:
       - score: '98.25'
         start_line: 2323
@@ -1169,6 +1192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
         rule_identifier: bsd-original_80.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_80.RULE
@@ -1202,6 +1226,7 @@ other_license_detections:
           EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_original-3dc9cdcb-7881-5f58-5eb0-abe40fe6974d
   - license_expression: unicode-dfs-2015
+    license_expression_spdx: Unicode-DFS-2015
     matches:
       - score: '99.57'
         start_line: 2353
@@ -1211,6 +1236,7 @@ other_license_detections:
         match_coverage: '99.57'
         matcher: 3-seq
         license_expression: unicode-dfs-2015
+        spdx_license_expression: Unicode-DFS-2015
         rule_identifier: unicode-dfs-2015_9.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode-dfs-2015_9.RULE
@@ -1272,6 +1298,7 @@ other_license_detections:
                prior written authorization of the copyright holder.
     identifier: unicode_dfs_2015-a68362d0-e886-6936-9f94-af7247f63c6f
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2410
@@ -1281,6 +1308,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_313.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_313.RULE
@@ -1310,6 +1338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-df1e02c8-d8f1-e983-3d20-fffa0788153b
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 2435
@@ -1319,6 +1348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
@@ -1348,6 +1378,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
   - license_expression: regexp
+    license_expression_spdx: Spencer-86
     matches:
       - score: '100.0'
         start_line: 2460
@@ -1357,6 +1388,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: regexp
+        spdx_license_expression: Spencer-86
         rule_identifier: regexp.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/regexp.LICENSE
@@ -1376,6 +1408,7 @@ other_license_detections:
                    be misrepresented as being the original software.
     identifier: regexp-80089f45-0a6c-4f30-e4b6-24334a206225
   - license_expression: ttwl
+    license_expression_spdx: TTWL
     matches:
       - score: '100.0'
         start_line: 2475
@@ -1385,6 +1418,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: ttwl
+        spdx_license_expression: TTWL
         rule_identifier: ttwl.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ttwl.LICENSE
@@ -1396,6 +1430,7 @@ other_license_detections:
           unless it passes the unmodified Text::Tabs test suite.
     identifier: ttwl-eeadd029-25f0-a4b1-0af8-c75212d02135
   - license_expression: other-copyleft
+    license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
       - score: '90.0'
         start_line: 2482
@@ -1405,6 +1440,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
         rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
@@ -1413,6 +1449,7 @@ other_license_detections:
           of this license document, but changing it is not allowed.
     identifier: other_copyleft-0ac0d4dd-1063-c305-80e8-d67a64a53eaf
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 2489
@@ -1422,6 +1459,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_45.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE
@@ -1434,6 +1472,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_285.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE
@@ -1446,6 +1485,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
@@ -1458,12 +1498,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public  domain
     identifier: public_domain-d6560563-b3c0-65ee-7cca-7225d652d54d
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+    license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 2508
@@ -1473,6 +1515,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
         rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
@@ -1504,6 +1547,7 @@ other_license_detections:
           version 2.2 of Bison.
     identifier: gpl_3_0_plus_with_bison_exception_2_2-637d6c30-89c5-8764-b189-8bb20227ccfc
   - license_expression: paul-hsieh-derivative
+    license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative
     matches:
       - score: '100.0'
         start_line: 2535
@@ -1513,6 +1557,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: paul-hsieh-derivative
+        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
         rule_identifier: paul-hsieh-derivative_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/paul-hsieh-derivative_1.RULE
@@ -1535,6 +1580,7 @@ other_license_detections:
              is not necessary.
     identifier: paul_hsieh_derivative-227e82af-732d-87b3-eb2c-9409d183d572
   - license_expression: bsd-x11
+    license_expression_spdx: LicenseRef-scancode-bsd-x11
     matches:
       - score: '99.0'
         start_line: 2556
@@ -1544,6 +1590,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-x11
+        spdx_license_expression: LicenseRef-scancode-bsd-x11
         rule_identifier: bsd-x11_10.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-x11_10.RULE
@@ -1576,6 +1623,7 @@ other_license_detections:
           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_x11-53db30c9-af29-3609-e3c2-f3c4ac87fabe
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 2583
@@ -1585,6 +1633,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE
@@ -1597,6 +1646,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_155.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE
@@ -1723,6 +1773,7 @@ other_license_detections:
              to this CC0 or use of the Work.
     identifier: cc0_1_0-d16cc04e-8802-8225-9e6f-0fb92bcba694
   - license_expression: fsf-ap
+    license_expression_spdx: FSFAP
     matches:
       - score: '100.0'
         start_line: 2710
@@ -1732,6 +1783,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: fsf-ap
+        spdx_license_expression: FSFAP
         rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
@@ -1742,6 +1794,7 @@ other_license_detections:
           warranty.
     identifier: fsf_ap-a7d380d0-4462-458a-36c1-1852bdcbf538
   - license_expression: artistic-dist-1.0
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
       - score: '100.0'
         start_line: 2716
@@ -1751,6 +1804,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
         rule_identifier: artistic-dist-1.0.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-dist-1.0.LICENSE
@@ -1882,6 +1936,7 @@ other_license_detections:
                                           The End
     identifier: artistic_dist_1_0-c8a5103b-b244-055a-58c3-4fd73f491e6a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 22
@@ -1891,6 +1946,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
@@ -1905,6 +1961,7 @@ other_license_detections:
              b) the "Artistic License" which comes with Perl.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-95ef4a7b-575e-74fe-2260-6fb5805fd955
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 49
@@ -1914,12 +1971,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 56
@@ -1929,12 +1988,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 64
@@ -1944,12 +2005,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 74
@@ -1959,12 +2022,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 105
@@ -1974,6 +2039,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -1982,6 +2048,7 @@ other_license_detections:
            License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 118
@@ -1991,6 +2058,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -1999,6 +2067,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 147
@@ -2008,12 +2077,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_14.RULE
         rule_relevance: 100
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 157
@@ -2023,6 +2094,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
@@ -2032,6 +2104,7 @@ other_license_detections:
           at your option, any later version of Perl 5 you may have available.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-c184d674-b309-2d8f-2170-8340d9b74afc
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 167
@@ -2041,6 +2114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
@@ -2049,6 +2123,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-32b9c99f-78d4-e645-c66f-2f10debb1d78
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 175
@@ -2058,6 +2133,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2066,6 +2142,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 183
@@ -2075,12 +2152,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         matched_text: All files are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4e05fce9-1807-80b2-856e-0fa39a440170
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '90.91'
         start_line: '190'
@@ -2090,12 +2169,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         matched_text: The PerlUi class is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-522746e5-bffc-fa4c-ea81-334067779aac
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '91.67'
         start_line: '198'
@@ -2105,12 +2186,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         matched_text: The Symbian port is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-7e59d507-72c7-19bf-6165-d58bcc316f9a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 208
@@ -2120,6 +2203,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
@@ -2128,6 +2212,7 @@ other_license_detections:
           as Perl.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-2ed96cd5-955e-4781-7dd3-7bcd315fff9b
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 223
@@ -2137,6 +2222,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2145,6 +2231,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 233
@@ -2154,6 +2241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -2162,6 +2250,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 241
@@ -2171,6 +2260,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2179,6 +2269,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 249
@@ -2188,6 +2279,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2196,6 +2288,7 @@ other_license_detections:
           terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 257
@@ -2205,6 +2298,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2213,6 +2307,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 267
@@ -2222,6 +2317,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -2230,6 +2326,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 275
@@ -2239,12 +2336,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '99.0'
         start_line: 309
@@ -2254,6 +2353,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
@@ -2262,6 +2362,7 @@ other_license_detections:
           It is assumed that they are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-8aa4724c-ae7c-4733-1063-b0a456c393d4
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 316
@@ -2271,6 +2372,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
@@ -2279,6 +2381,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-fc24870c-10ae-2148-d3bf-e786583923db
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 330
@@ -2288,12 +2391,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 336
@@ -2303,6 +2408,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
@@ -2311,6 +2417,7 @@ other_license_detections:
           same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-7efcdd95-ec2e-48b4-6b08-e8b6a41ced5d
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 345
@@ -2320,6 +2427,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
@@ -2329,6 +2437,7 @@ other_license_detections:
           any later version of Perl 5.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8ca7b680-12a9-c6a8-d60b-abd1b0e1aa81
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 355
@@ -2338,6 +2447,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
@@ -2346,6 +2456,7 @@ other_license_detections:
           same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-7efcdd95-ec2e-48b4-6b08-e8b6a41ced5d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 362
@@ -2355,6 +2466,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2363,6 +2475,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 382
@@ -2372,6 +2485,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2380,6 +2494,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 395
@@ -2389,6 +2504,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2397,6 +2513,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 402
@@ -2406,6 +2523,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2414,6 +2532,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 411
@@ -2423,12 +2542,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         matched_text: You may redistribute this under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-d15d44f1-6970-d898-4fa2-eb72ec024222
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 419
@@ -2438,6 +2559,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2446,6 +2568,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 431
@@ -2455,6 +2578,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2463,6 +2587,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 439
@@ -2472,6 +2597,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2480,6 +2606,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 447
@@ -2489,6 +2616,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2497,6 +2625,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 454
@@ -2506,6 +2635,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2514,6 +2644,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 465
@@ -2523,6 +2654,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2531,6 +2663,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -2540,6 +2673,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2548,6 +2682,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 484
@@ -2557,6 +2692,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2565,6 +2701,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 494
@@ -2574,6 +2711,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2582,6 +2720,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 502
@@ -2591,6 +2730,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2599,6 +2739,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 509
@@ -2608,6 +2749,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2616,6 +2758,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-2.0
+    license_expression_spdx: Artistic-2.0
     matches:
       - score: '100.0'
         start_line: 516
@@ -2625,6 +2768,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
         rule_identifier: artistic-2.0_38.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_38.RULE
@@ -2633,6 +2777,7 @@ other_license_detections:
           under the terms of the the Artistic License (2.0).
     identifier: artistic_2_0-e78d6739-c4ab-40c9-572b-bcaabfb23964
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 524
@@ -2642,6 +2787,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2650,6 +2796,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 531
@@ -2659,6 +2806,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2667,6 +2815,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 539
@@ -2676,6 +2825,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
@@ -2689,6 +2839,7 @@ other_license_detections:
           Public License.
     identifier: artistic_perl_1_0_or_gpl_2_0_plus-b35b8478-ff32-af71-be53-77500ee9fe8c
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 553
@@ -2698,6 +2849,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2706,6 +2858,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 561
@@ -2715,6 +2868,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
@@ -2731,6 +2885,7 @@ other_license_detections:
           file.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3c906dee-c087-db95-4092-056433d16fb5
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 578
@@ -2740,6 +2895,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2748,6 +2904,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 585
@@ -2757,6 +2914,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
@@ -2765,6 +2923,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-18449fdf-781e-7e30-7f07-dfe1ecca6ee1
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 600
@@ -2774,6 +2933,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
@@ -2782,6 +2942,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-fc24870c-10ae-2148-d3bf-e786583923db
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 609
@@ -2791,6 +2952,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2799,6 +2961,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 618
@@ -2808,6 +2971,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2816,6 +2980,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 628
@@ -2825,6 +2990,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2833,6 +2999,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 636
@@ -2842,6 +3009,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
@@ -2853,6 +3021,7 @@ other_license_detections:
           later version.
     identifier: artistic_perl_1_0_or_gpl_2_0_plus-9838542c-8067-e5da-446d-8a162c7c3cc5
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 647
@@ -2862,6 +3031,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -2870,6 +3040,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 655
@@ -2879,6 +3050,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2887,6 +3059,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 663
@@ -2896,6 +3069,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2904,6 +3078,7 @@ other_license_detections:
           it and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 673
@@ -2913,6 +3088,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -2921,6 +3097,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 681
@@ -2930,6 +3107,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2938,6 +3116,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 690
@@ -2947,6 +3126,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2955,6 +3135,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 698
@@ -2964,6 +3145,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
@@ -2972,6 +3154,7 @@ other_license_detections:
           or the Artistic License, as specified in the LICENCE file.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-998f11a5-2f46-f75b-3298-dbfa69a673aa
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 706
@@ -2981,6 +3164,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -2989,6 +3173,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 717
@@ -2998,6 +3183,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3006,6 +3192,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 724
@@ -3015,6 +3202,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3023,6 +3211,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 732
@@ -3032,6 +3221,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
@@ -3041,6 +3231,7 @@ other_license_detections:
           redistribute it and/or modify it under the same terms as Perl itself.
     identifier: mit_or_gpl_1_0_plus_or_artistic_perl_1_0-109da13c-da24-fa09-6ec8-f6606ea1dddf
   - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '99.0'
         start_line: 748
@@ -3050,6 +3241,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         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
         rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
@@ -3058,6 +3250,7 @@ other_license_detections:
           the rest of the Locale-Maketext-Simple distribution.
     identifier: mit_or_artistic_perl_1_0_or_gpl_1_0_plus-5a94f7ce-d5c0-58cd-b181-c00f8fbbc497
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 755
@@ -3067,6 +3260,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3075,6 +3269,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 763
@@ -3084,6 +3279,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
@@ -3095,6 +3291,7 @@ other_license_detections:
           Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8e682309-5b67-ab89-6945-3ea7a79aa541
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 775
@@ -3104,6 +3301,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3112,6 +3310,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND metamail
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail
     matches:
       - score: '100.0'
         start_line: 784
@@ -3121,6 +3320,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3135,6 +3335,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: metamail
+        spdx_license_expression: metamail
         rule_identifier: metamail.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
@@ -3151,6 +3352,7 @@ other_license_detections:
            WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and_metamail-708741c8-a456-165a-5e15-4d96c736bb61
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 809
@@ -3160,6 +3362,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3168,6 +3371,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 817
@@ -3177,6 +3381,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3185,6 +3390,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 825
@@ -3194,12 +3400,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         matched_text: This module is released under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-6ac722a3-703c-e413-9b17-5dd475d88fa5
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 832
@@ -3209,6 +3417,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3217,6 +3426,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 840
@@ -3226,6 +3436,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -3234,6 +3445,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 848
@@ -3243,6 +3455,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3252,6 +3465,7 @@ other_license_detections:
           as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 857
@@ -3261,6 +3475,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3269,6 +3484,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 866
@@ -3278,6 +3494,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3286,6 +3503,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 875
@@ -3295,6 +3513,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3303,6 +3522,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 919
@@ -3312,6 +3532,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3320,6 +3541,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 927
@@ -3329,6 +3551,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3337,6 +3560,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 935
@@ -3346,6 +3570,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3354,6 +3579,8 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 AND public-domain AND (artistic-2.0 AND public-domain-disclaimer)
+    license_expression_spdx: Artistic-1.0-Perl AND LicenseRef-scancode-public-domain AND (Artistic-2.0
+      AND LicenseRef-scancode-public-domain-disclaimer)
     matches:
       - score: '100.0'
         start_line: 950
@@ -3363,6 +3590,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_12.RULE
@@ -3380,6 +3608,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_286.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
@@ -3397,6 +3626,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
@@ -3406,6 +3636,7 @@ other_license_detections:
            them as you see fit (and at your own risk with no warranty from anyone).
     identifier: artistic_perl_1_0_and_public_domain_and__artistic_2_0_and_public_domain_disclaimer-2d510dad-1736-1044-1f83-ffc03282e54a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 975
@@ -3415,6 +3646,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
@@ -3424,6 +3656,7 @@ other_license_detections:
           as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-3f59d10a-2b40-7221-4e05-ac331bac263d
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 984
@@ -3433,6 +3666,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3441,6 +3675,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 992
@@ -3450,6 +3685,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3458,6 +3694,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1008
@@ -3467,6 +3704,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -3475,6 +3713,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1029
@@ -3484,6 +3723,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
@@ -3492,6 +3732,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8104884-0d49-693f-2246-ae9522b0bf98
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1037
@@ -3501,6 +3742,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3509,6 +3751,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1045
@@ -3518,6 +3761,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3526,6 +3770,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1054
@@ -3535,6 +3780,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3543,6 +3789,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1063
@@ -3552,6 +3799,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3560,6 +3808,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1072
@@ -3569,6 +3818,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3577,6 +3827,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1080
@@ -3586,6 +3837,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3594,6 +3846,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1096
@@ -3603,6 +3856,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3611,6 +3865,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1104
@@ -3620,6 +3875,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -3634,6 +3890,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_287.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
@@ -3645,6 +3902,7 @@ other_license_detections:
           credit would be courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-1eb230bb-78ce-5300-5012-920fd3811563
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1119
@@ -3654,6 +3912,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3662,6 +3921,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1126
@@ -3671,6 +3931,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3679,6 +3940,7 @@ other_license_detections:
           and/or modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: cc0-1.0
+    license_expression_spdx: CC0-1.0
     matches:
       - score: '100.0'
         start_line: 1138
@@ -3688,6 +3950,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
         rule_identifier: cc0-1.0_154.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_154.RULE
@@ -3697,6 +3960,7 @@ other_license_detections:
           end of this file.
     identifier: cc0_1_0-ce0a113c-2f14-79cb-71e2-f8d26c4e9bc9
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1148
@@ -3706,6 +3970,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3714,6 +3979,7 @@ other_license_detections:
           modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 1156
@@ -3723,6 +3989,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
@@ -3733,6 +4000,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-825f9c5f-31da-bfc2-ad53-0cceccade3a2
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1180
@@ -3742,6 +4010,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
@@ -3753,6 +4022,7 @@ other_license_detections:
           the same explicit licensing information.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-4b362e04-cf63-aed3-04d0-700b12e560b9
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 1191
@@ -3762,6 +4032,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -3770,6 +4041,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1198
@@ -3779,6 +4051,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
@@ -3787,6 +4060,7 @@ other_license_detections:
           terms as Perl.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-5d9e5932-ca64-fd4b-88f4-3bdacbc03f1d
   - license_expression: bsd-new AND (gpl-1.0-plus OR artistic-perl-1.0)
+    license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl)
     matches:
       - score: '99.0'
         start_line: 1208
@@ -3796,6 +4070,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1065.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1065.RULE
@@ -3808,6 +4083,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_relevance: 70
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
@@ -3816,6 +4092,7 @@ other_license_detections:
           terms as the rest of the distribution.
     identifier: bsd_new_and__gpl_1_0_plus_or_artistic_perl_1_0-66a31b89-70bb-c59f-36de-c76a8ce944e0
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1218
@@ -3825,6 +4102,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3833,6 +4111,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: unicode
+    license_expression_spdx: LicenseRef-scancode-unicode
     matches:
       - score: '100.0'
         start_line: 1226
@@ -3842,12 +4121,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
         rule_identifier: unicode_14.RULE
         rule_relevance: 100
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1236
@@ -3857,6 +4138,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -3865,6 +4147,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1248
@@ -3874,6 +4157,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
@@ -3885,6 +4169,7 @@ other_license_detections:
           as Perl itself and contained this copyright notice:
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a0e346e-31dc-322f-05d4-2902f683ce20
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1262
@@ -3894,6 +4179,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3902,6 +4188,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1271
@@ -3911,6 +4198,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -3919,6 +4207,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1279
@@ -3928,6 +4217,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -3936,6 +4226,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1288
@@ -3945,6 +4236,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3953,6 +4245,8 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND (gpl-1.0-plus OR artistic-perl-1.0)
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND (GPL-1.0-or-later OR
+      Artistic-1.0-Perl)
     matches:
       - score: '100.0'
         start_line: 1297
@@ -3962,6 +4256,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -3976,6 +4271,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
@@ -3984,6 +4280,7 @@ other_license_detections:
           Porters, which was released under the same license terms.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and__gpl_1_0_plus_or_artistic_perl_1_0-00e61bda-5cd5-19fb-b521-ca0d569c0379
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1308
@@ -3993,6 +4290,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
@@ -4001,6 +4299,7 @@ other_license_detections:
           and/or modified under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-e8fc6fc9-6684-3799-00a7-dc38172bda29
   - license_expression: gpl-1.0-plus OR artistic-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
       - score: '100.0'
         start_line: 1315
@@ -4010,6 +4309,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
         rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
@@ -4018,6 +4318,7 @@ other_license_detections:
           the same terms as the Perl 5 programming language system itself.
     identifier: gpl_1_0_plus_or_artistic_1_0-83290536-f01d-d3fa-2e0c-62204354be7a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1324
@@ -4027,6 +4328,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4035,6 +4337,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1332
@@ -4044,6 +4347,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
@@ -4052,6 +4356,7 @@ other_license_detections:
           as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bc101dac-fad1-f7aa-f226-ac50d2a1e9f3
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1340
@@ -4061,6 +4366,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4069,6 +4375,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1349
@@ -4078,6 +4385,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4092,6 +4400,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
@@ -4101,6 +4410,7 @@ other_license_detections:
           the correct attribution.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-022b9900-7aee-6501-6734-49f6ea2c95da
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1361
@@ -4110,12 +4420,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1368
@@ -4125,6 +4437,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4133,6 +4446,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1375
@@ -4142,12 +4456,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1382
@@ -4157,6 +4473,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -4165,6 +4482,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1390
@@ -4174,12 +4492,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         matched_text: This program is distributed under the same terms as perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-2bcbbce8-54f0-bccc-2196-d6690e456d84
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1397
@@ -4189,6 +4509,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
@@ -4197,6 +4518,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-253ad29b-8eea-a58f-0e55-7f1f30b4d132
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1409
@@ -4206,6 +4528,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
@@ -4214,6 +4537,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-abf4b96c-fc73-c8e3-29cd-08cded8bef2c
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1417
@@ -4223,6 +4547,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4231,6 +4556,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new
+    license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 1427
@@ -4240,6 +4566,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
@@ -4253,6 +4580,7 @@ other_license_detections:
           under the terms of the "BSD-3-clause-GENERIC" license included in this file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus__and_bsd_new-4ecf727d-f402-75d3-46ee-1a9cb87ec7cb
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1456
@@ -4262,6 +4590,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4270,6 +4599,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1467
@@ -4279,6 +4609,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
@@ -4287,6 +4618,7 @@ other_license_detections:
           it under the same terms as Perl
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-0aab4f56-a9e1-f787-6f06-4a75c1c9b81e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1476
@@ -4296,6 +4628,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4304,6 +4637,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1487
@@ -4313,6 +4647,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4321,6 +4656,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1497
@@ -4330,6 +4666,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
@@ -4338,6 +4675,7 @@ other_license_detections:
           in the README file that comes with the distribution.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-8a66f022-d8b4-4b86-212a-934dd2bc3089
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1517
@@ -4347,6 +4685,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4355,6 +4694,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1527
@@ -4364,6 +4704,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
@@ -4373,6 +4714,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-3b848d2f-500b-c107-aa42-9eb5c222ff60
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1539
@@ -4382,6 +4724,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4390,6 +4733,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1547
@@ -4399,6 +4743,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4407,6 +4752,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1556
@@ -4416,6 +4762,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4424,6 +4771,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1566
@@ -4433,6 +4781,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
@@ -4441,6 +4790,7 @@ other_license_detections:
           distribution is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-1a86e593-e255-ed0a-e5a1-d8fdbea5e365
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1574
@@ -4450,6 +4800,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4458,6 +4809,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1582
@@ -4467,6 +4819,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
@@ -4475,6 +4828,7 @@ other_license_detections:
           under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-0c90b422-60c3-e525-05ea-c266dd2a51b1
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1590
@@ -4484,6 +4838,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4492,6 +4847,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1598
@@ -4501,6 +4857,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
@@ -4510,6 +4867,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-baa14b4d-271c-af68-77f4-4cfd796ec9ea
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1609
@@ -4519,6 +4877,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
@@ -4526,6 +4885,7 @@ other_license_detections:
           itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-c6a20c55-7328-0e53-7889-7c78c5415d0b
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1616
@@ -4535,6 +4895,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4543,6 +4904,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1624
@@ -4552,6 +4914,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
@@ -4561,6 +4924,7 @@ other_license_detections:
            License:     Artistic/GPL
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-21b340f7-1c33-9e19-4d95-6db009738447
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1633
@@ -4570,6 +4934,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4578,6 +4943,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-1.0
+    license_expression_spdx: Artistic-1.0
     matches:
       - score: '90.0'
         start_line: 1641
@@ -4587,12 +4953,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-1.0
+        spdx_license_expression: Artistic-1.0
         rule_identifier: artistic-1.0_11.RULE
         rule_relevance: 90
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE
         matched_text: the artistic license.
     identifier: artistic_1_0-2ff80857-def0-0ed3-86d0-f745062039f9
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1661
@@ -4602,6 +4970,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
@@ -4610,6 +4979,7 @@ other_license_detections:
           It is assumed that it is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-71dd85f2-c2a8-e634-a472-12fad824a9b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 1670
@@ -4619,6 +4989,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
@@ -4633,6 +5004,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4641,6 +5013,7 @@ other_license_detections:
            modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4608b132-68af-fc8c-5b55-7bfbd0034d22
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1687
@@ -4650,6 +5023,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
@@ -4659,6 +5033,7 @@ other_license_detections:
           at your option, any later version of Perl 5 you may have available.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-02d238e7-dfb3-3d0f-17b5-552ede2bf765
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1696
@@ -4668,6 +5043,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4676,6 +5052,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1705
@@ -4685,6 +5062,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4693,6 +5071,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0
+    license_expression_spdx: Artistic-1.0-Perl
     matches:
       - score: '99.0'
         start_line: 1712
@@ -4702,12 +5081,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
         rule_identifier: artistic-perl-1.0_7.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_7.RULE
         matched_text: This program is distributed under the Artistic License.
     identifier: artistic_perl_1_0-2d6db20c-52be-912f-b056-8d081e123f91
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1723
@@ -4717,6 +5098,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
@@ -4725,6 +5107,7 @@ other_license_detections:
           License or the Artistic License, as specified in the README file.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-bce9eb76-af55-8217-d862-796e5d7accc7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1734
@@ -4734,6 +5117,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
@@ -4742,6 +5126,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-781b2f48-5747-4d66-d428-c271c1b34947
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1742
@@ -4751,6 +5136,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4759,6 +5145,7 @@ other_license_detections:
           it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1761
@@ -4768,12 +5155,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1768
@@ -4783,6 +5172,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
@@ -4791,6 +5181,7 @@ other_license_detections:
           itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-995430fd-ab65-9897-2857-c13429160160
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1778
@@ -4800,6 +5191,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -4814,6 +5206,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_286.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
@@ -4825,6 +5218,7 @@ other_license_detections:
           be courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-93862a24-32df-2e58-a989-877ba708872a
   - license_expression: artistic-2.0 AND public-domain-disclaimer
+    license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
     matches:
       - score: '100.0'
         start_line: 1794
@@ -4834,6 +5228,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
         rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
@@ -4843,6 +5238,7 @@ other_license_detections:
           them as you see fit (and at your own risk with no warranty from anyone).
     identifier: artistic_2_0_and_public_domain_disclaimer-0f623011-76a2-9362-7a9e-866e141da819
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1805
@@ -4852,12 +5248,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1814
@@ -4867,12 +5265,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1821
@@ -4882,12 +5282,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1836
@@ -4897,6 +5299,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -4905,6 +5308,7 @@ other_license_detections:
           the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
+    license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 1844
@@ -4914,6 +5318,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
@@ -4928,6 +5333,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_287.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
@@ -4939,6 +5345,7 @@ other_license_detections:
           courteous but is not required.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_public_domain-1eb230bb-78ce-5300-5012-920fd3811563
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1861
@@ -4948,12 +5355,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1868
@@ -4963,12 +5372,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 1875
@@ -4978,12 +5389,14 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: 1891
@@ -4993,6 +5406,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
@@ -5001,6 +5415,7 @@ other_license_detections:
           modify it under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-5362e445-2780-fe5e-5f5c-8e18d2260a6e
   - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '1913'
@@ -5010,6 +5425,8 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
+          OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
@@ -5032,6 +5449,7 @@ other_license_detections:
           "Artistic-dist" tag.
     identifier: artistic_perl_1_0_or_artistic_dist_1_0_or_gpl_1_0_plus-9cd54d77-c838-d496-0a92-de100a6c75bc
   - license_expression: artistic-dist-1.0
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
       - score: '100.0'
         start_line: '1942'
@@ -5041,6 +5459,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
         rule_identifier: artistic-dist-1.0_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_3.RULE
@@ -5050,6 +5469,7 @@ other_license_detections:
           under the "Artistic-dist" tag.
     identifier: artistic_dist_1_0-52936621-27b8-5371-2fc4-9a5b06005497
   - license_expression: artistic-dist-1.0 OR gpl-1.0-plus
+    license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
       - score: '100.0'
         start_line: '1969'
@@ -5059,6 +5479,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         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
         rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
@@ -5090,6 +5511,7 @@ other_license_detections:
           "Artistic-dist" tag.
     identifier: artistic_dist_1_0_or_gpl_1_0_plus-7fb72184-972c-40cb-2bf5-2a39c35cbc5a
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+    license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
       - score: '100.0'
         start_line: 2000
@@ -5099,6 +5521,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
         rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
@@ -5113,6 +5536,7 @@ other_license_detections:
              b) the "Artistic License" which comes with Perl.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-95ef4a7b-575e-74fe-2260-6fb5805fd955
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+    license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
       - score: '95.0'
         start_line: 2020
@@ -5122,6 +5546,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
         rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_relevance: 95
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
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 d2c0de42b1a..89f3aaa53e5 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.3-plus
+    license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later
     matches:
       - score: '98.28'
         start_line: 11
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_285.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_285.RULE
@@ -33,6 +35,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
         rule_identifier: gfdl-1.3-plus_5.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_5.RULE
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 56979981f35..23f37c5eb7e 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
@@ -10,6 +10,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 33
@@ -19,6 +20,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -31,6 +33,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_735.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_735.RULE
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 35a287d3ed1..7be8aed2acd 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
@@ -5,6 +5,7 @@ other_license_expression:
 other_license_expression_spdx:
 license_detections:
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 20
@@ -14,6 +15,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_283.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_283.RULE
@@ -24,6 +26,7 @@ license_detections:
           \ version 3 can be found in /usr/share/common-licenses/GPL-3."
     identifier: gpl_3_0_plus-72552c94-3196-d38e-6a71-2d6e21cd1304
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 32
@@ -33,6 +36,7 @@ license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_734.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_734.RULE
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 1bb29a6a522..147339b9015 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
@@ -72,6 +72,7 @@ other_license_expression_spdx: (GPL-2.0-or-later AND GPL-2.0-or-later) AND (GPL-
 license_detections: []
 other_license_detections:
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 345
@@ -81,6 +82,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_28.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
@@ -89,6 +91,7 @@ other_license_detections:
           it what you wish.
     identifier: public_domain-94c09237-25b0-ab6d-340e-62eae2b7eea9
   - license_expression: gpl-2.0
+    license_expression_spdx: GPL-2.0-only
     matches:
       - score: '100.0'
         start_line: 350
@@ -98,6 +101,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
@@ -110,6 +114,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
         rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
@@ -131,6 +136,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0-f0da9233-5233-7bfb-cd4d-15c9cbd6a410
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 367
@@ -140,6 +146,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -152,6 +159,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
@@ -174,6 +182,7 @@ other_license_detections:
           License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-389a73cc-676e-ecc6-075d-3774a1be9778
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 385
@@ -183,6 +192,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -195,6 +205,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
@@ -216,6 +227,7 @@ other_license_detections:
           License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-6dd38d39-ae32-a5a3-58aa-6d4f4a3f1cdb
   - license_expression: bsd-simplified
+    license_expression_spdx: BSD-2-Clause
     matches:
       - score: '100.0'
         start_line: 403
@@ -225,6 +237,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
         rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
@@ -239,6 +252,7 @@ other_license_detections:
              documentation and/or other materials provided with the distribution.
     identifier: bsd_simplified-523bd88c-42d2-11cb-3886-60be795149d1
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 413
@@ -248,6 +262,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
@@ -279,6 +294,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-e6286cfc-fd40-08e1-ed33-3c2c1bad1f07
   - license_expression: bsd-original-uc
+    license_expression_spdx: BSD-4-Clause-UC
     matches:
       - score: '100.0'
         start_line: 440
@@ -288,6 +304,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
         rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
@@ -321,6 +338,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 468
@@ -330,6 +348,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
@@ -342,6 +361,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
@@ -353,6 +373,7 @@ other_license_detections:
           License can be found in ‘/usr/share/common-licenses/LGPL’.
     identifier: lgpl_2_0_plus_and_lgpl_2_1_plus-ee535b08-2e62-57ac-9b69-0ee8b03bde15
   - license_expression: lgpl-2.0-plus
+    license_expression_spdx: LGPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 475
@@ -362,6 +383,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE
@@ -374,6 +396,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
         rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
@@ -395,6 +418,7 @@ other_license_detections:
           can be found in /usr/share/common-licenses/LGPL-2 file.
     identifier: lgpl_2_0_plus-8aa1c724-4bbb-dbb4-937d-77e7ac7027fe
   - license_expression: lgpl-2.1-plus
+    license_expression_spdx: LGPL-2.1-or-later
     matches:
       - score: '100.0'
         start_line: 492
@@ -404,6 +428,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE
@@ -416,6 +441,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
         rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
@@ -438,6 +464,7 @@ other_license_detections:
           License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
     identifier: lgpl_2_1_plus-920f52f3-7de9-6f8b-d6c2-998167ded0bd
   - license_expression: lgpl-3.0-plus
+    license_expression_spdx: LGPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 510
@@ -447,6 +474,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE
@@ -459,6 +487,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
         rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
@@ -480,6 +509,7 @@ other_license_detections:
           Public License can be found in "/usr/share/common-licenses/LGPL-3".
     identifier: lgpl_3_0_plus-65e3f8ed-4734-2985-77a5-8c1ebf21d5a1
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 528
@@ -489,6 +519,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 d8f22d0950c..682a2ba8a64 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
@@ -11,6 +11,7 @@ other_license_expression_spdx: Zlib AND Zlib AND Zlib AND Zlib
 license_detections: []
 other_license_detections:
   - license_expression: zlib
+    license_expression_spdx: Zlib
     matches:
       - score: '100.0'
         start_line: 57
@@ -20,6 +21,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zlib
+        spdx_license_expression: Zlib
         rule_identifier: zlib_17.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
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 716755b790b..2847eb4408f 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
@@ -34,6 +34,7 @@ other_license_expression_spdx: Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause) AND
 license_detections: []
 other_license_detections:
   - license_expression: apache-2.0
+    license_expression_spdx: Apache-2.0
     matches:
       - score: '100.0'
         start_line: 71
@@ -43,6 +44,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE
@@ -55,6 +57,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_971.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_971.RULE
@@ -78,6 +81,7 @@ other_license_detections:
           be found in the file `/usr/share/common-licenses/Apache-2.0'.
     identifier: apache_2_0-54a3cb61-dd1f-a43e-0748-862fb858b0d2
   - license_expression: zeusbench
+    license_expression_spdx: LicenseRef-scancode-zeusbench
     matches:
       - score: '100.0'
         start_line: 94
@@ -87,6 +91,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: zeusbench
+        spdx_license_expression: LicenseRef-scancode-zeusbench
         rule_identifier: zeusbench_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zeusbench_1.RULE
@@ -103,6 +108,7 @@ other_license_detections:
             possibility of such damage
     identifier: zeusbench-015480ab-358c-46e9-b585-8bc7330ace50
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 118
@@ -112,6 +118,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
@@ -143,6 +150,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bd6a26eb-db9d-de45-5d56-8c5674ddfb3f
   - license_expression: x11-keith-packard AND metamail
+    license_expression_spdx: HPND-sell-variant AND metamail
     matches:
       - score: '100.0'
         start_line: 172
@@ -152,6 +160,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: x11-keith-packard
+        spdx_license_expression: HPND-sell-variant
         rule_identifier: x11-keith-packard3.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-keith-packard3.RULE
@@ -184,6 +193,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: metamail
+        spdx_license_expression: metamail
         rule_identifier: metamail.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
@@ -200,6 +210,7 @@ other_license_detections:
           WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
     identifier: x11_keith_packard_and_metamail-34a511f5-3e81-16a2-de12-7fbbb7e0f5c7
   - license_expression: gpl-3.0-plus
+    license_expression_spdx: GPL-3.0-or-later
     matches:
       - score: '100.0'
         start_line: 209
@@ -209,6 +220,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE
@@ -221,6 +233,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
         rule_identifier: gpl-3.0-plus_483.RULE
         rule_relevance: 99
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_483.RULE
@@ -240,6 +253,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-3'.
     identifier: gpl_3_0_plus-19d9def9-e12c-2282-ca9d-6b65b77eb924
   - license_expression: gpl-2.0-plus
+    license_expression_spdx: GPL-2.0-or-later
     matches:
       - score: '100.0'
         start_line: 224
@@ -249,6 +263,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE
@@ -261,6 +276,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
         rule_identifier: gpl-2.0-plus_986.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_986.RULE
@@ -280,6 +296,7 @@ other_license_detections:
           `/usr/share/common-licenses/GPL-2'.
     identifier: gpl_2_0_plus-54a2dc03-8069-9f58-8fd2-21a866d843f8
   - license_expression: public-domain
+    license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
       - score: '100.0'
         start_line: 240
@@ -289,6 +306,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
         rule_identifier: public-domain_361.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_361.RULE
@@ -328,6 +346,7 @@ other_license_detections:
           Mark Cox, mark@ukweb.com, Allow relative URLs even when no base specified
     identifier: public_domain-a7ae1690-4f60-4902-e6d2-15dc3a028b4c
   - license_expression: bsd-simplified-darwin
+    license_expression_spdx: LicenseRef-scancode-bsd-simplified-darwin
     matches:
       - score: '100.0'
         start_line: 279
@@ -337,6 +356,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bsd-simplified-darwin
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
         rule_identifier: bsd-simplified-darwin.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE
@@ -367,6 +387,7 @@ other_license_detections:
           SUCH DAMAGE.
     identifier: bsd_simplified_darwin-9a2496b0-cc3a-2546-8280-ca8b6b3383c6
   - license_expression: apache-2.0 AND hs-regexp
+    license_expression_spdx: Apache-2.0 AND Spencer-94
     matches:
       - score: '100.0'
         start_line: 306
@@ -376,6 +397,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
         rule_identifier: apache-2.0_1021.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1021.RULE
@@ -392,6 +414,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
         rule_identifier: hs-regexp_1.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_1.RULE
@@ -417,6 +440,7 @@ other_license_detections:
           4. This notice may not be removed or altered.
     identifier: apache_2_0_and_hs_regexp-418b8fd9-1905-1ad7-6930-311a90aaf0a7
   - license_expression: bsd-unchanged
+    license_expression_spdx: LicenseRef-scancode-bsd-unchanged
     matches:
       - score: '100.0'
         start_line: 370
@@ -426,6 +450,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-unchanged
+        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
         rule_identifier: bsd-unchanged_4.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unchanged_4.RULE
@@ -454,6 +479,7 @@ other_license_detections:
           THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_unchanged-b3a50ceb-2258-90d8-693d-32de170e8f80
   - license_expression: bsd-new
+    license_expression_spdx: BSD-3-Clause
     matches:
       - score: '100.0'
         start_line: 395
@@ -463,6 +489,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
         rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
@@ -494,6 +521,7 @@ other_license_detections:
           POSSIBILITY OF SUCH DAMAGE.
     identifier: bsd_new-bd6a26eb-db9d-de45-5d56-8c5674ddfb3f
   - license_expression: bison-exception-2.2
+    license_expression_spdx: Bison-exception-2.2
     matches:
       - score: '100.0'
         start_line: 422
@@ -503,6 +531,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 2-aho
         license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
         rule_identifier: bison-exception-2.2.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bison-exception-2.2.LICENSE
@@ -521,6 +550,7 @@ other_license_detections:
             version 2.2 of Bison.  */
     identifier: bison_exception_2_2-b8782f6d-6348-8be8-bb53-4f79d1684277
   - license_expression: mit
+    license_expression_spdx: MIT
     matches:
       - score: '100.0'
         start_line: 439
@@ -530,6 +560,7 @@ other_license_detections:
         match_coverage: '100.0'
         matcher: 1-hash
         license_expression: mit
+        spdx_license_expression: MIT
         rule_identifier: mit.LICENSE
         rule_relevance: 100
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
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 a73af976ccd..de7bc031ce7 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
@@ -40,6 +40,7 @@
     "license_detections": [
       {
         "license_expression": "x11-fsf",
+        "license_expression_spdx": "X11-distribute-modifications-variant",
         "matches": [
           {
             "score": 100.0,
@@ -50,6 +51,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-fsf",
+            "spdx_license_expression": "X11-distribute-modifications-variant",
             "rule_identifier": "x11-fsf.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -60,6 +62,7 @@
       },
       {
         "license_expression": "x11-xconsortium",
+        "license_expression_spdx": "X11",
         "matches": [
           {
             "score": 100.0,
@@ -70,6 +73,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
             "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -80,6 +84,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -90,6 +95,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_19.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -100,6 +106,7 @@
       },
       {
         "license_expression": "x11-xconsortium",
+        "license_expression_spdx": "X11",
         "matches": [
           {
             "score": 100.0,
@@ -110,6 +117,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
             "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -216,6 +224,7 @@
             "license_detections": [
               {
                 "license_expression": "x11-fsf",
+                "license_expression_spdx": "X11-distribute-modifications-variant",
                 "matches": [
                   {
                     "score": 100.0,
@@ -226,6 +235,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-fsf",
+                    "spdx_license_expression": "X11-distribute-modifications-variant",
                     "rule_identifier": "x11-fsf.LICENSE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -236,6 +246,7 @@
               },
               {
                 "license_expression": "x11-xconsortium",
+                "license_expression_spdx": "X11",
                 "matches": [
                   {
                     "score": 100.0,
@@ -246,6 +257,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
                     "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -256,6 +268,7 @@
               },
               {
                 "license_expression": "bsd-new",
+                "license_expression_spdx": "BSD-3-Clause",
                 "matches": [
                   {
                     "score": 100.0,
@@ -266,6 +279,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "bsd-new",
+                    "spdx_license_expression": "BSD-3-Clause",
                     "rule_identifier": "bsd-new_19.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -276,6 +290,7 @@
               },
               {
                 "license_expression": "x11-xconsortium",
+                "license_expression_spdx": "X11",
                 "matches": [
                   {
                     "score": 100.0,
@@ -286,6 +301,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
                     "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -454,6 +470,7 @@
     "other_license_detections": [
       {
         "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+        "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
         "matches": [
           {
             "score": 100.0,
@@ -464,6 +481,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -478,6 +496,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -492,6 +511,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
             "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
@@ -580,6 +600,7 @@
             "other_license_detections": [
               {
                 "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+                "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
                 "matches": [
                   {
                     "score": 100.0,
@@ -590,6 +611,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
                     "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -604,6 +626,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
                     "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -618,6 +641,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "lgpl-2.1",
+                    "spdx_license_expression": "LGPL-2.1-only",
                     "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
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 eb3e4fb2faf..8bb7c95f7c7 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
@@ -41,6 +41,7 @@
       "license_detections": [
         {
           "license_expression": "x11-fsf",
+          "license_expression_spdx": "X11-distribute-modifications-variant",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +52,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-fsf",
+              "spdx_license_expression": "X11-distribute-modifications-variant",
               "rule_identifier": "x11-fsf.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -61,6 +63,7 @@
         },
         {
           "license_expression": "x11-xconsortium",
+          "license_expression_spdx": "X11",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +74,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
               "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -81,6 +85,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -91,6 +96,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -101,6 +107,7 @@
         },
         {
           "license_expression": "x11-xconsortium",
+          "license_expression_spdx": "X11",
           "matches": [
             {
               "score": 100.0,
@@ -111,6 +118,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
               "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -229,6 +237,7 @@
       "other_license_detections": [
         {
           "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+          "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
           "matches": [
             {
               "score": 100.0,
@@ -239,6 +248,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -253,6 +263,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -267,6 +278,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
               "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
@@ -405,6 +417,7 @@
           "license_detections": [
             {
               "license_expression": "x11-fsf",
+              "license_expression_spdx": "X11-distribute-modifications-variant",
               "matches": [
                 {
                   "score": 100.0,
@@ -415,6 +428,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-fsf",
+                  "spdx_license_expression": "X11-distribute-modifications-variant",
                   "rule_identifier": "x11-fsf.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -425,6 +439,7 @@
             },
             {
               "license_expression": "x11-xconsortium",
+              "license_expression_spdx": "X11",
               "matches": [
                 {
                   "score": 100.0,
@@ -435,6 +450,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
                   "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -445,6 +461,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -455,6 +472,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_19.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -465,6 +483,7 @@
             },
             {
               "license_expression": "x11-xconsortium",
+              "license_expression_spdx": "X11",
               "matches": [
                 {
                   "score": 100.0,
@@ -475,6 +494,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
                   "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -548,6 +568,7 @@
           "other_license_detections": [
             {
               "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+              "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -558,6 +579,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -572,6 +594,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -586,6 +609,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1",
+                  "spdx_license_expression": "LGPL-2.1-only",
                   "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
diff --git a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected
index eac39a80a9e..8c5f916b958 100644
--- a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected
+++ b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
diff --git a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected
index 39598f10057..f375514b67c 100644
--- a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected
+++ b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "gpl-3.0_32.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_32.RULE",
diff --git a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected
index 0fbf7e04ac1..aa75fc5ebd8 100644
--- a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected
+++ b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "ruby",
+        "license_expression_spdx": "Ruby",
         "matches": [
           {
             "score": 100.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "ruby",
+            "spdx_license_expression": "Ruby",
             "rule_identifier": "spdx-license-identifier-ruby-549f9d48faec54b20eadf7c9097124f88f2cdd2b",
             "rule_relevance": 100,
             "rule_url": null,
@@ -62,6 +64,7 @@
       },
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -72,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
diff --git a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected
index 30b06391d44..a4cc0375975 100644
--- a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected
+++ b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "gpl-3.0_32.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_32.RULE",
@@ -62,6 +64,7 @@
       },
       {
         "license_expression": "ruby",
+        "license_expression_spdx": "Ruby",
         "matches": [
           {
             "score": 100.0,
@@ -72,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "ruby",
+            "spdx_license_expression": "Ruby",
             "rule_identifier": "spdx-license-identifier-ruby-549f9d48faec54b20eadf7c9097124f88f2cdd2b",
             "rule_relevance": 100,
             "rule_url": null,
@@ -82,6 +86,7 @@
       },
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -92,6 +97,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
diff --git a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected
index 4a7ecaf001a..c55003b80dc 100644
--- a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected
+++ b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "python",
+        "license_expression_spdx": "Python-2.0",
         "matches": [
           {
             "score": 80.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "python",
+            "spdx_license_expression": "Python-2.0",
             "rule_identifier": "python_10.RULE",
             "rule_relevance": 80,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_10.RULE",
@@ -62,6 +64,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -72,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_416.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_416.RULE",
diff --git a/tests/packagedcode/data/haxe/basic/haxelib.json.expected b/tests/packagedcode/data/haxe/basic/haxelib.json.expected
index 31229971428..9d6292df722 100644
--- a/tests/packagedcode/data/haxe/basic/haxelib.json.expected
+++ b/tests/packagedcode/data/haxe/basic/haxelib.json.expected
@@ -74,6 +74,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 50.0,
@@ -84,6 +85,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl_bare_word_only.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
diff --git a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected
index 7f49ccf4bc9..c05a6d17d29 100644
--- a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected
+++ b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/haxe/deps/haxelib.json.expected b/tests/packagedcode/data/haxe/deps/haxelib.json.expected
index eaf6c469e67..3c30076376d 100644
--- a/tests/packagedcode/data/haxe/deps/haxelib.json.expected
+++ b/tests/packagedcode/data/haxe/deps/haxelib.json.expected
@@ -49,6 +49,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -59,6 +60,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
diff --git a/tests/packagedcode/data/haxe/tags/haxelib.json.expected b/tests/packagedcode/data/haxe/tags/haxelib.json.expected
index ed20bf92d36..38284ae52ca 100644
--- a/tests/packagedcode/data/haxe/tags/haxelib.json.expected
+++ b/tests/packagedcode/data/haxe/tags/haxelib.json.expected
@@ -46,6 +46,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -56,6 +57,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 488dd4487a2..8236a786e3f 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
@@ -47,6 +47,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -57,6 +58,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -93,6 +95,7 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 4,
       "sample_matches": [
         {
@@ -104,6 +107,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -114,6 +118,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -125,6 +130,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -135,6 +141,7 @@
     {
       "identifier": "mit-56f9dd7c-a466-cdf0-4fe0-6e57d31bc32a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -146,6 +153,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -160,6 +168,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -181,6 +190,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -191,6 +201,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -268,6 +279,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -278,6 +290,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -313,6 +326,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -323,6 +337,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -332,6 +347,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -342,6 +358,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE"
@@ -355,6 +372,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -479,6 +497,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -489,6 +508,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -564,6 +584,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -574,6 +595,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -877,6 +899,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -887,6 +910,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -932,6 +956,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -942,6 +967,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
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 58dc4b93e97..f25cce320d6 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
@@ -47,6 +47,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -57,6 +58,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -159,6 +161,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -169,6 +172,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 be25a3049a7..f3261a40357 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
@@ -180,6 +182,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -190,6 +193,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json
index be25a3049a7..f3261a40357 100644
--- a/tests/packagedcode/data/instance/python-package-instance-expected.json
+++ b/tests/packagedcode/data/instance/python-package-instance-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
@@ -180,6 +182,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -190,6 +193,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
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 dafcb9f0c36..fec80afc8e2 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
@@ -61,6 +63,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
@@ -140,6 +143,7 @@
     {
       "identifier": "bsd_new-261898a0-0118-87c4-7092-14e4ff134882",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -152,6 +156,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -162,6 +167,7 @@
     {
       "identifier": "bsd_new-68720980-08c9-ffb1-f28e-24c2e067385b",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -176,6 +182,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_1302.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE",
@@ -190,6 +197,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -200,6 +208,7 @@
     {
       "identifier": "bsd_new-c0e1e2ee-7e69-b9f1-a736-85b2eaa65db2",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [
         "package-unknown-reference-to-local-file"
@@ -214,6 +223,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_1305.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
@@ -228,6 +238,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -238,6 +249,7 @@
     {
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -250,6 +262,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -271,6 +284,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -281,6 +295,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
@@ -349,6 +364,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -359,6 +375,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
@@ -373,6 +390,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
@@ -419,6 +437,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -429,6 +448,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_1302.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE"
@@ -442,6 +462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
@@ -454,6 +475,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -464,6 +486,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE"
@@ -510,6 +533,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -520,6 +544,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
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 c8161b92298..c387bbba371 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
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -233,6 +235,7 @@
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [
         "from-package-file"
@@ -247,6 +250,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -289,6 +293,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -299,6 +304,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -448,6 +454,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -458,6 +465,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
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 6fc148cfba4..7575d7d9765 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
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_166.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
@@ -117,6 +119,7 @@
     {
       "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -129,6 +132,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_166.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
@@ -148,6 +152,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -158,6 +163,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_166.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
@@ -205,6 +211,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -215,6 +222,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_166.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
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 0acb30fc8c8..f7da7a66e9b 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
@@ -55,6 +55,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
               "score": 94.81,
@@ -65,6 +66,7 @@
               "match_coverage": 94.81,
               "matcher": "3-seq",
               "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
               "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
@@ -138,6 +140,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -148,6 +151,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -158,6 +162,7 @@
         },
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -168,6 +173,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_52.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
@@ -237,6 +243,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -247,6 +254,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -257,6 +265,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -267,6 +276,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -277,6 +287,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 50.0,
@@ -287,6 +298,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -297,6 +309,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -307,6 +320,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_200.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
@@ -454,6 +468,7 @@
     {
       "identifier": "mit_or_gpl_2_0_plus__and_gpl_2_0-876682c2-38c1-1236-75ea-c46243d9c414",
       "license_expression": "(mit OR gpl-2.0-plus) AND gpl-2.0",
+      "license_expression_spdx": "(MIT OR GPL-2.0-or-later) AND GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -466,6 +481,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit OR gpl-2.0-plus",
+          "license_expression_spdx": "MIT OR GPL-2.0-or-later",
           "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0-plus_1.RULE",
@@ -480,6 +496,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
@@ -490,6 +507,7 @@
     {
       "identifier": "gpl_1_0_plus-473308ff-72ce-7e72-b3a9-5b1cc6680abb",
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -502,6 +520,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -512,6 +531,7 @@
     {
       "identifier": "gpl_1_0_plus-b6a20479-06f3-d753-878b-d3193c879108",
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -524,6 +544,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_200.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
@@ -534,6 +555,7 @@
     {
       "identifier": "gpl_2_0-d7f02717-086e-f71b-962e-b18cc23b1827",
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -546,6 +568,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
@@ -556,6 +579,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -568,6 +592,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -578,6 +603,7 @@
     {
       "identifier": "mit-9967e727-165e-9bb5-f090-7de5e47a3929",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -590,6 +616,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -600,6 +627,7 @@
     {
       "identifier": "mit_or_gpl_2_0-562fb174-abc9-da75-d29f-5bc4f1d9c56f",
       "license_expression": "mit OR gpl-2.0",
+      "license_expression_spdx": "MIT OR GPL-2.0-only",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -612,6 +640,7 @@
           "match_coverage": 94.81,
           "matcher": "3-seq",
           "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "rule_identifier": "mit_or_gpl-2.0_68.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
@@ -622,6 +651,7 @@
     {
       "identifier": "mit_or_gpl_2_0-7f34a90b-f7b4-e345-2cc0-2de55fdcc1bd",
       "license_expression": "mit OR gpl-2.0",
+      "license_expression_spdx": "MIT OR GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -634,6 +664,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "rule_identifier": "mit_or_gpl-2.0_69.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_69.RULE",
@@ -660,6 +691,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
               "score": 94.81,
@@ -670,6 +702,7 @@
               "match_coverage": 94.81,
               "matcher": "3-seq",
               "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
               "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
@@ -717,6 +750,7 @@
           "license_detections": [
             {
               "license_expression": "mit OR gpl-2.0",
+              "license_expression_spdx": "MIT OR GPL-2.0-only",
               "matches": [
                 {
                   "score": 94.81,
@@ -727,6 +761,7 @@
                   "match_coverage": 94.81,
                   "matcher": "3-seq",
                   "license_expression": "mit OR gpl-2.0",
+                  "spdx_license_expression": "MIT OR GPL-2.0-only",
                   "rule_identifier": "mit_or_gpl-2.0_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
@@ -828,6 +863,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -838,6 +874,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -848,6 +885,7 @@
             },
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -858,6 +896,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_52.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
@@ -908,6 +947,7 @@
       "license_detections": [
         {
           "license_expression": "(mit OR gpl-2.0-plus) AND gpl-2.0",
+          "license_expression_spdx": "(MIT OR GPL-2.0-or-later) AND GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -918,6 +958,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit OR gpl-2.0-plus",
+              "spdx_license_expression": "MIT OR GPL-2.0-or-later",
               "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0-plus_1.RULE",
@@ -932,6 +973,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_52.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
@@ -991,6 +1033,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1001,6 +1044,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1011,6 +1055,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1021,6 +1066,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -1031,6 +1077,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 50.0,
@@ -1041,6 +1088,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -1051,6 +1099,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -1061,6 +1110,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_200.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
@@ -1160,6 +1210,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1170,6 +1221,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
               "rule_identifier": "mit_or_gpl-2.0_69.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_69.RULE",
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 d005e7ada6e..d78c1058636 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 16.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_383.RULE",
               "rule_relevance": 16,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
@@ -61,6 +63,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -75,6 +78,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -147,6 +151,7 @@
     {
       "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-17115808-8fc8-9c98-b64d-c5013bcbde1b",
       "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -161,6 +166,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_382.RULE",
           "rule_relevance": 33,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
@@ -175,6 +181,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -189,6 +196,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -199,6 +207,7 @@
     {
       "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-2a11c930-7038-736e-5e48-b35f872691cc",
       "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -211,6 +220,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -225,6 +235,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -235,6 +246,7 @@
     {
       "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
       "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [
         "package-unknown-reference-to-local-file"
@@ -249,6 +261,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_383.RULE",
           "rule_relevance": 16,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
@@ -263,6 +276,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -277,6 +291,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -296,6 +311,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -306,6 +322,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -320,6 +337,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -375,6 +393,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 16.0,
@@ -385,6 +404,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_383.RULE",
                   "rule_relevance": 16,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
@@ -399,6 +419,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -413,6 +434,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_63.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
@@ -476,6 +498,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-1.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 33.0,
@@ -486,6 +509,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_382.RULE",
               "rule_relevance": 33,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
@@ -500,6 +524,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -514,6 +539,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
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 a83d73453fb..99913c38c6e 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -61,6 +63,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -75,6 +78,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -112,6 +116,7 @@
     {
       "identifier": "mit-a979a2a3-dfdb-02aa-2450-71641a61a264",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -126,6 +131,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -140,6 +146,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -154,6 +161,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -164,6 +172,7 @@
     {
       "identifier": "mit-ac40beba-5702-f54d-755f-333441314bb0",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -176,6 +185,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -190,6 +200,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -209,6 +220,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -219,6 +231,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -233,6 +246,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -288,6 +302,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -298,6 +313,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -312,6 +328,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -326,6 +343,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -362,6 +380,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -372,6 +391,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -386,6 +406,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -400,6 +421,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
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 8490fd9c97f..5b02c141258 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
@@ -126,6 +128,7 @@
           "license_detections": [
             {
               "license_expression": "unknown-license-reference",
+              "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
               "matches": [
                 {
                   "score": 100.0,
@@ -136,6 +139,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
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 f434eb9daab..96ad42eb558 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
@@ -61,6 +63,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -98,6 +101,7 @@
     {
       "identifier": "zlib-9531c668-be8d-7a25-49eb-c18c9dcd616b",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -112,6 +116,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_in_manifest.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
@@ -126,6 +131,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -136,6 +142,7 @@
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -148,6 +155,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -167,6 +175,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -177,6 +186,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -232,6 +242,7 @@
           "license_detections": [
             {
               "license_expression": "zlib",
+              "license_expression_spdx": "Zlib",
               "matches": [
                 {
                   "score": 100.0,
@@ -242,6 +253,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
@@ -256,6 +268,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "zlib.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -292,6 +305,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -302,6 +316,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
@@ -316,6 +331,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
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 31ed2a9f8d5..6e02eed6ee3 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
@@ -126,6 +128,7 @@
           "license_detections": [
             {
               "license_expression": "zlib",
+              "license_expression_spdx": "Zlib",
               "matches": [
                 {
                   "score": 100.0,
@@ -136,6 +139,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
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 cb9fd3ca93e..2f1eef8380f 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
@@ -49,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -59,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -95,6 +97,7 @@
     {
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -107,6 +110,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -117,6 +121,7 @@
     {
       "identifier": "bsd_new-af493d9f-0c66-d9f8-4538-579134812514",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-package"
@@ -131,6 +136,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
@@ -145,6 +151,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -207,6 +214,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -217,6 +225,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -252,6 +261,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -262,6 +272,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -288,6 +299,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -298,6 +310,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
@@ -312,6 +325,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 1edcc00e92c..f1781014972 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
@@ -4758,6 +4758,7 @@
     {
       "identifier": "bsd_new-008266ae-6939-ad31-3617-228b0809863c",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -4770,6 +4771,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_195.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -4780,6 +4782,7 @@
     {
       "identifier": "bsd_original-9198bafe-47c0-f9dc-5ef1-bd276a69786e",
       "license_expression": "bsd-original",
+      "license_expression_spdx": "BSD-4-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -4792,6 +4795,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "rule_identifier": "bsd-original_43.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -4802,6 +4806,7 @@
     {
       "identifier": "bsd_simplified-2383ae10-5494-e069-46c2-e2d6cb56951f",
       "license_expression": "bsd-simplified",
+      "license_expression_spdx": "BSD-2-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -4814,6 +4819,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-simplified",
+          "license_expression_spdx": "BSD-2-Clause",
           "rule_identifier": "bsd-simplified_136.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
@@ -4824,6 +4830,7 @@
     {
       "identifier": "free_unknown-34d6195a-6206-be2e-4bd2-ce3b9493a1ad",
       "license_expression": "free-unknown",
+      "license_expression_spdx": "LicenseRef-scancode-free-unknown",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -4836,6 +4843,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
@@ -4846,6 +4854,7 @@
     {
       "identifier": "free_unknown-fddf748a-9953-bc6c-cb9d-91001840e335",
       "license_expression": "free-unknown",
+      "license_expression_spdx": "LicenseRef-scancode-free-unknown",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -4858,6 +4867,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -4868,6 +4878,7 @@
     {
       "identifier": "gpl_2_0_plus-227f50b1-f05e-5b3b-b107-ae1e2f56448b",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 44,
       "detection_log": [],
       "sample_matches": [
@@ -4880,6 +4891,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_687.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -4890,6 +4902,7 @@
     {
       "identifier": "gpl_2_0_plus-53a26be2-1f88-01ec-d294-921768a513c9",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 42,
       "detection_log": [],
       "sample_matches": [
@@ -4902,6 +4915,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -4912,6 +4926,7 @@
     {
       "identifier": "gpl_2_0_plus-fed2dc38-09ac-103e-1b86-4a4f5c00614a",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": null,
       "detection_count": 2,
       "detection_log": [
         "possible-false-positive",
@@ -4927,6 +4942,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_67.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
@@ -4937,6 +4953,7 @@
     {
       "identifier": "gpl_2_0_plus_and_free_unknown-7df72521-0609-4896-2583-44c45dd3f8e6",
       "license_expression": "gpl-2.0-plus AND free-unknown",
+      "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -4949,6 +4966,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -4963,6 +4981,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -4973,6 +4992,7 @@
     {
       "identifier": "gpl_2_0_plus_and_free_unknown-f9cd0597-d35d-ec72-0e6b-77970ad90317",
       "license_expression": "gpl-2.0-plus AND free-unknown",
+      "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -4985,6 +5005,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -4999,6 +5020,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -5009,6 +5031,7 @@
     {
       "identifier": "gpl_2_0_plus_and_gpl_3_0_plus_and_lgpl_2_1_plus_and_lgpl_3_0_plus_and_bsd_new_and_bsd_original_and_mit_and_public_domain_and_other_permissive-9e2a213a-3fc4-9ee3-8e3f-783829530b14",
       "license_expression": "gpl-2.0-plus AND gpl-3.0-plus AND lgpl-2.1-plus AND lgpl-3.0-plus AND bsd-new AND bsd-original AND mit AND public-domain AND other-permissive",
+      "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -5021,6 +5044,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -5035,6 +5059,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_89.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
@@ -5049,6 +5074,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_64.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
@@ -5063,6 +5089,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
@@ -5077,6 +5104,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -5091,6 +5119,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
@@ -5105,6 +5134,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -5119,6 +5149,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_1038.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
@@ -5133,6 +5164,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_92.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE",
@@ -5147,6 +5179,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_512.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
@@ -5161,6 +5194,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_108.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -5175,6 +5209,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_418.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
@@ -5189,6 +5224,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_437.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -5203,6 +5239,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -5217,6 +5254,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_195.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -5231,6 +5269,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_577.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
@@ -5245,6 +5284,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "rule_identifier": "bsd-original_43.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -5259,6 +5299,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "rule_identifier": "bsd-original_71.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
@@ -5273,6 +5314,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -5287,6 +5329,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_189.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
@@ -5301,6 +5344,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -5315,6 +5359,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "other-permissive",
+          "license_expression_spdx": "LicenseRef-scancode-other-permissive",
           "rule_identifier": "other-permissive_325.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
@@ -5325,6 +5370,7 @@
     {
       "identifier": "lgpl_3_0_plus-4c8d95b2-1acf-7a81-473c-d8e70962288c",
       "license_expression": "lgpl-3.0-plus",
+      "license_expression_spdx": "LGPL-3.0-or-later",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -5337,6 +5383,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -5347,6 +5394,7 @@
     {
       "identifier": "mit-1f9f2ae8-7020-0a13-7934-461c752929a4",
       "license_expression": "mit",
+      "license_expression_spdx": null,
       "detection_count": 6,
       "detection_log": [
         "possible-false-positive",
@@ -5362,6 +5410,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_437.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -5372,6 +5421,7 @@
     {
       "identifier": "public_domain-1a6a4f2c-bd92-9942-920f-be3d0c2bbda6",
       "license_expression": "public-domain",
+      "license_expression_spdx": null,
       "detection_count": 2,
       "detection_log": [
         "possible-false-positive",
@@ -5387,6 +5437,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -5738,6 +5789,7 @@
           "match_coverage": 4.71,
           "matcher": "3-seq",
           "license_expression": "borceux",
+          "spdx_license_expression": "Borceux",
           "rule_identifier": "borceux.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
@@ -5902,6 +5954,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -5912,6 +5965,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -5923,6 +5977,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus AND free-unknown",
+              "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -5933,6 +5988,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -5947,6 +6003,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "free-unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
                   "rule_identifier": "free-unknown-package_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -5958,6 +6015,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -5968,6 +6026,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -5979,6 +6038,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -5989,6 +6049,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6000,6 +6061,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -6010,6 +6072,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_195.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -6021,6 +6084,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6031,6 +6095,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6042,6 +6107,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6052,6 +6118,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6063,6 +6130,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6073,6 +6141,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6084,6 +6153,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6094,6 +6164,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6105,6 +6176,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6115,6 +6187,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6126,6 +6199,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6136,6 +6210,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6147,6 +6222,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus AND free-unknown",
+              "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -6157,6 +6233,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6171,6 +6248,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "free-unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
                   "rule_identifier": "free-unknown-package_4.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -6182,6 +6260,7 @@
             },
             {
               "license_expression": "lgpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6192,6 +6271,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -6203,6 +6283,7 @@
             },
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 99.0,
@@ -6213,6 +6294,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "pypi_public_domain.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -6227,6 +6309,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6237,6 +6320,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_67.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
@@ -6251,6 +6335,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6261,6 +6346,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6275,6 +6361,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6285,6 +6372,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6299,6 +6387,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6309,6 +6398,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -6323,6 +6413,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6333,6 +6424,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6347,6 +6439,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6357,6 +6450,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6371,6 +6465,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6381,6 +6476,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6395,6 +6491,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6405,6 +6502,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6419,6 +6517,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6429,6 +6528,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6443,6 +6543,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6453,6 +6554,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6467,6 +6569,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6477,6 +6580,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6491,6 +6595,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6501,6 +6606,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6515,6 +6621,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6525,6 +6632,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6539,6 +6647,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6549,6 +6658,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6563,6 +6673,7 @@
             },
             {
               "license_expression": "bsd-original",
+              "license_expression_spdx": "BSD-4-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -6573,6 +6684,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
                   "rule_identifier": "bsd-original_43.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -6584,6 +6696,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6594,6 +6707,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -6608,6 +6722,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": null,
               "matches": [
                 {
                   "score": 100.0,
@@ -6618,6 +6733,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -6632,6 +6748,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus AND gpl-3.0-plus AND lgpl-2.1-plus AND lgpl-3.0-plus AND bsd-new AND bsd-original AND mit AND public-domain AND other-permissive",
+              "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
               "matches": [
                 {
                   "score": 100.0,
@@ -6642,6 +6759,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6656,6 +6774,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_89.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
@@ -6670,6 +6789,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_64.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
@@ -6684,6 +6804,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_36.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
@@ -6698,6 +6819,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -6712,6 +6834,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
                   "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
@@ -6726,6 +6849,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -6740,6 +6864,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_1038.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
@@ -6754,6 +6879,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_92.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE",
@@ -6768,6 +6894,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_512.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
@@ -6782,6 +6909,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -6796,6 +6924,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl-2.1-plus_418.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
@@ -6810,6 +6939,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -6824,6 +6954,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -6838,6 +6969,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_195.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -6852,6 +6984,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_577.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
@@ -6866,6 +6999,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
                   "rule_identifier": "bsd-original_43.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -6880,6 +7014,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
                   "rule_identifier": "bsd-original_71.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
@@ -6894,6 +7029,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -6908,6 +7044,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_189.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
@@ -6922,6 +7059,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "pypi_public_domain.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -6936,6 +7074,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "other-permissive",
+                  "spdx_license_expression": "LicenseRef-scancode-other-permissive",
                   "rule_identifier": "other-permissive_325.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
@@ -6947,6 +7086,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6957,6 +7097,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -6968,6 +7109,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6978,6 +7120,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -6989,6 +7132,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -6999,6 +7143,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7010,6 +7155,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7020,6 +7166,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7031,6 +7178,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7041,6 +7189,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7052,6 +7201,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7062,6 +7212,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7073,6 +7224,7 @@
             },
             {
               "license_expression": "bsd-simplified",
+              "license_expression_spdx": "BSD-2-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -7083,6 +7235,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-simplified",
+                  "spdx_license_expression": "BSD-2-Clause",
                   "rule_identifier": "bsd-simplified_136.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
@@ -7094,6 +7247,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7104,6 +7258,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7115,6 +7270,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7125,6 +7281,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7136,6 +7293,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7146,6 +7304,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7157,6 +7316,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7167,6 +7327,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7178,6 +7339,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7188,6 +7350,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7199,6 +7362,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7209,6 +7373,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7220,6 +7385,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7230,6 +7396,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7241,6 +7408,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7251,6 +7419,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7262,6 +7431,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7272,6 +7442,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7283,6 +7454,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7293,6 +7465,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7304,6 +7477,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7314,6 +7488,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7325,6 +7500,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7335,6 +7511,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7346,6 +7523,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7356,6 +7534,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7367,6 +7546,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7377,6 +7557,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7388,6 +7569,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7398,6 +7580,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -7409,6 +7592,7 @@
             },
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -7419,6 +7603,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -12021,6 +12206,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12031,6 +12217,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12042,6 +12229,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus AND free-unknown",
+          "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -12052,6 +12240,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12066,6 +12255,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -12077,6 +12267,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12087,6 +12278,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12098,6 +12290,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12108,6 +12301,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12119,6 +12313,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -12129,6 +12324,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_195.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -12140,6 +12336,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12150,6 +12347,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12161,6 +12359,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12171,6 +12370,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12182,6 +12382,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12192,6 +12393,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12203,6 +12405,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12213,6 +12416,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12224,6 +12428,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12234,6 +12439,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12245,6 +12451,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12255,6 +12462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12266,6 +12474,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus AND free-unknown",
+          "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -12276,6 +12485,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12290,6 +12500,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -12301,6 +12512,7 @@
         },
         {
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -12311,6 +12523,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -12322,6 +12535,7 @@
         },
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 99.0,
@@ -12332,6 +12546,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "pypi_public_domain.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -12346,6 +12561,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12356,6 +12572,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_67.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
@@ -12370,6 +12587,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12380,6 +12598,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12394,6 +12613,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12404,6 +12624,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12418,6 +12639,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12428,6 +12650,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -12442,6 +12665,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12452,6 +12676,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12466,6 +12691,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12476,6 +12702,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12490,6 +12717,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12500,6 +12728,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12514,6 +12743,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12524,6 +12754,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12538,6 +12769,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12548,6 +12780,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12562,6 +12795,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12572,6 +12806,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12586,6 +12821,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12596,6 +12832,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12610,6 +12847,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12620,6 +12858,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12634,6 +12873,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12644,6 +12884,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12658,6 +12899,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12668,6 +12910,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12682,6 +12925,7 @@
         },
         {
           "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -12692,6 +12936,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
               "rule_identifier": "bsd-original_43.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -12703,6 +12948,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12713,6 +12959,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -12727,6 +12974,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": null,
           "matches": [
             {
               "score": 100.0,
@@ -12737,6 +12985,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -12751,6 +13000,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus AND gpl-3.0-plus AND lgpl-2.1-plus AND lgpl-3.0-plus AND bsd-new AND bsd-original AND mit AND public-domain AND other-permissive",
+          "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
           "matches": [
             {
               "score": 100.0,
@@ -12761,6 +13011,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12775,6 +13026,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_89.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
@@ -12789,6 +13041,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_64.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
@@ -12803,6 +13056,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
@@ -12817,6 +13071,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -12831,6 +13086,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
               "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
@@ -12845,6 +13101,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE",
@@ -12859,6 +13116,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_1038.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
@@ -12873,6 +13131,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_92.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE",
@@ -12887,6 +13146,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_512.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
@@ -12901,6 +13161,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -12915,6 +13176,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_418.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
@@ -12929,6 +13191,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
@@ -12943,6 +13206,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -12957,6 +13221,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_195.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
@@ -12971,6 +13236,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_577.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
@@ -12985,6 +13251,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
               "rule_identifier": "bsd-original_43.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
@@ -12999,6 +13266,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
               "rule_identifier": "bsd-original_71.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
@@ -13013,6 +13281,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE",
@@ -13027,6 +13296,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_189.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
@@ -13041,6 +13311,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "pypi_public_domain.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -13055,6 +13326,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "other-permissive",
+              "spdx_license_expression": "LicenseRef-scancode-other-permissive",
               "rule_identifier": "other-permissive_325.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
@@ -13179,6 +13451,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13189,6 +13462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13200,6 +13474,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13210,6 +13485,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13221,6 +13497,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13231,6 +13508,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13242,6 +13520,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13252,6 +13531,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13263,6 +13543,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13273,6 +13554,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13284,6 +13566,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13294,6 +13577,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13305,6 +13589,7 @@
         },
         {
           "license_expression": "bsd-simplified",
+          "license_expression_spdx": "BSD-2-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -13315,6 +13600,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-simplified",
+              "spdx_license_expression": "BSD-2-Clause",
               "rule_identifier": "bsd-simplified_136.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
@@ -13326,6 +13612,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13336,6 +13623,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13347,6 +13635,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13357,6 +13646,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13368,6 +13658,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13378,6 +13669,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13389,6 +13681,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13399,6 +13692,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13410,6 +13704,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13420,6 +13715,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13431,6 +13727,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13441,6 +13738,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13452,6 +13750,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13462,6 +13761,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13473,6 +13773,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13483,6 +13784,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13494,6 +13796,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13504,6 +13807,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13515,6 +13819,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13525,6 +13830,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13536,6 +13842,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13546,6 +13853,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13557,6 +13865,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13567,6 +13876,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13578,6 +13888,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13588,6 +13899,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13599,6 +13911,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13609,6 +13922,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13620,6 +13934,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13630,6 +13945,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13641,6 +13957,7 @@
         },
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -13651,6 +13968,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
@@ -13671,6 +13989,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "spdx_license_expression": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_37.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_37.RULE",
@@ -13685,6 +14004,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_221.RULE",
           "rule_relevance": 90,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_221.RULE",
@@ -13699,6 +14019,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "other-permissive",
+          "spdx_license_expression": "LicenseRef-scancode-other-permissive",
           "rule_identifier": "other-permissive_16.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_16.RULE",
@@ -13713,6 +14034,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -13727,6 +14049,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original",
+          "spdx_license_expression": "BSD-4-Clause",
           "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
@@ -13741,6 +14064,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
           "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -13972,6 +14296,7 @@
       "license_detections": [
         {
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -13982,6 +14307,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -14106,6 +14432,7 @@
       "license_detections": [
         {
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -14116,6 +14443,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
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 1f4bee613f4..cef7ee9ca94 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
@@ -49,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -59,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -142,6 +144,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -152,6 +155,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -188,6 +192,7 @@
     {
       "identifier": "apache_2_0_and_cc_by_nc_nd_3_0_and_other_permissive_and_proprietary_license-21b00e16-ec3a-6dc3-3971-5dbd5f5b756a",
       "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -200,6 +205,7 @@
           "match_coverage": 5.88,
           "matcher": "3-seq",
           "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
           "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
@@ -210,6 +216,7 @@
     {
       "identifier": "bsd_new-f4e99f86-00ab-18d9-a65d-a3a12767dcf5",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 6,
       "detection_log": [],
       "sample_matches": [
@@ -222,6 +229,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -232,6 +240,7 @@
     {
       "identifier": "bsd_new-cdb8fe96-c13c-043d-8031-aebb4cd77653",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 5,
       "detection_log": [
         "unknown-reference-in-file-to-package"
@@ -246,6 +255,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -260,6 +270,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -270,6 +281,7 @@
     {
       "identifier": "bsd_new-72cae3bc-4423-3a9e-be84-ee8bb5120a4d",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -282,6 +294,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "bsd-new_683.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
@@ -292,6 +305,7 @@
     {
       "identifier": "bsd_new-734cc7c8-5d13-b9e1-3f7c-d04a0d9396c7",
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-in-file-to-package"
@@ -306,6 +320,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -320,6 +335,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -381,6 +397,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
           "matches": [
             {
               "score": 5.88,
@@ -391,6 +408,7 @@
               "match_coverage": 5.88,
               "matcher": "3-seq",
               "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",
               "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
@@ -505,6 +523,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -515,6 +534,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -529,6 +549,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -557,6 +578,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -567,6 +589,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -581,6 +604,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -633,6 +657,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -643,6 +668,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -657,6 +683,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -685,6 +712,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -695,6 +723,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -709,6 +738,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -737,6 +767,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -747,6 +778,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -761,6 +793,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -887,6 +920,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -897,6 +931,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -932,6 +967,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -942,6 +978,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1008,6 +1045,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1018,6 +1056,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_683.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
@@ -1044,6 +1083,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
           "matches": [
             {
               "score": 5.88,
@@ -1054,6 +1094,7 @@
               "match_coverage": 5.88,
               "matcher": "3-seq",
               "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",
               "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
@@ -1139,6 +1180,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -1149,6 +1191,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1184,6 +1227,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -1194,6 +1238,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1306,6 +1351,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1316,6 +1362,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -1330,6 +1377,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1382,6 +1430,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -1392,6 +1441,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
@@ -1406,6 +1456,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1455,6 +1506,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -1465,6 +1517,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_683.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
@@ -1558,6 +1611,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -1568,6 +1622,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1603,6 +1658,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -1613,6 +1669,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 5c141a6ffb6..d830da8e677 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
@@ -43,6 +43,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -53,6 +54,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -63,6 +65,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -73,6 +76,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -388,6 +392,7 @@
     {
       "identifier": "apache_2_0-35de6d3f-8962-0454-2270-33aac504c123",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-in-file-to-package"
@@ -402,6 +407,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -416,6 +422,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -430,6 +437,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -440,6 +448,7 @@
     {
       "identifier": "apache_2_0-999670be-3d5e-ebf8-ae18-b555c26c5e80",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -452,6 +461,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1215.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
@@ -462,6 +472,7 @@
     {
       "identifier": "apache_2_0-abb5bcc3-dac9-a935-3392-31a86beb482a",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -476,6 +487,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_83.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
@@ -490,6 +502,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_164.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -500,6 +513,7 @@
     {
       "identifier": "apache_2_0-ec8d7936-cda2-7097-40cf-dbe8a06e916e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -512,6 +526,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_164.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -522,6 +537,7 @@
     {
       "identifier": "apache_2_0-3972bfb2-eb21-3d0c-d862-1642babb9f95",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -534,6 +550,7 @@
           "match_coverage": 74.36,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1297.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1297.RULE",
@@ -544,6 +561,7 @@
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -556,6 +574,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
@@ -566,6 +585,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -578,6 +598,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -588,6 +609,7 @@
     {
       "identifier": "apache_2_0-da72644e-69e0-e2c0-89c5-5d42277b3f3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -600,6 +622,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -614,6 +637,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -624,6 +648,7 @@
     {
       "identifier": "apache_2_0-e267f9d9-ae62-e9c9-9cc2-8cd0a1e4928f",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -636,6 +661,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -657,6 +683,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 99.81,
@@ -667,6 +694,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_164.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -693,6 +721,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 66.67,
@@ -703,6 +732,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1215.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
@@ -729,6 +759,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -739,6 +770,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_83.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
@@ -753,6 +785,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_164.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -829,6 +862,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -839,6 +873,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -853,6 +888,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -867,6 +903,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -895,6 +932,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -905,6 +943,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -919,6 +958,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -933,6 +973,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -1166,6 +1207,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1176,6 +1218,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
@@ -1223,6 +1266,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 99.81,
@@ -1233,6 +1277,7 @@
                   "match_coverage": 100.0,
                   "matcher": "3-seq",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_164.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -1244,6 +1289,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 66.67,
@@ -1254,6 +1300,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_1215.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
@@ -1265,6 +1312,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1275,6 +1323,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_83.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
@@ -1289,6 +1338,7 @@
                   "match_coverage": 100.0,
                   "matcher": "3-seq",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_164.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
@@ -1585,6 +1635,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1595,6 +1646,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -1605,6 +1657,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 95.0,
@@ -1615,6 +1668,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "pypi_apache_no-version.RULE",
                   "rule_relevance": 95,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -1671,6 +1725,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 74.36,
@@ -1681,6 +1736,7 @@
               "match_coverage": 74.36,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1297.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1297.RULE",
@@ -1692,6 +1748,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -1702,6 +1759,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -1716,6 +1774,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
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 ca5c7cc82bb..372a0a08b71 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
@@ -5,6 +5,7 @@
     {
       "identifier": "gpl_3_0-ab79e5a8-e510-cbf4-5302-ef968484bcdf",
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -27,6 +29,7 @@
     {
       "identifier": "gpl_3_0-76e8f741-ece2-d587-493c-92b0b1e4bdfe",
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
@@ -41,6 +44,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -55,6 +59,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -69,6 +74,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -83,6 +89,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -97,6 +104,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -111,6 +119,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -125,6 +134,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -135,6 +145,7 @@
     {
       "identifier": "gpl_3_0-e907b820-6f8c-81c4-38c5-75006ae093a4",
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
@@ -149,6 +160,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -163,6 +175,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -177,6 +190,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -191,6 +205,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -205,6 +220,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -219,6 +235,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -233,6 +250,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -247,6 +265,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -257,6 +276,7 @@
     {
       "identifier": "gpl_3_0_and_unknown_license_reference_and_gpl_3_0_plus-ebd5f076-5cba-e641-e071-0028c4ee0ddb",
       "license_expression": "gpl-3.0 AND unknown-license-reference AND gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-only AND LicenseRef-scancode-unknown-license-reference AND GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -269,6 +289,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_203.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_203.RULE",
@@ -283,6 +304,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_367.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_367.RULE",
@@ -297,6 +319,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -307,6 +330,7 @@
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -319,6 +343,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -338,6 +363,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -348,6 +374,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -396,6 +423,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0 AND unknown-license-reference AND gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-only AND LicenseRef-scancode-unknown-license-reference AND GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -406,6 +434,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_203.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_203.RULE",
@@ -420,6 +449,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_367.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_367.RULE",
@@ -434,6 +464,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -458,6 +489,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -468,6 +500,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -504,6 +537,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -514,6 +548,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -528,6 +563,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -542,6 +578,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -556,6 +593,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -570,6 +608,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -584,6 +623,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -598,6 +638,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -612,6 +653,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -638,6 +680,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -648,6 +691,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -662,6 +706,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -676,6 +721,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -690,6 +736,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -704,6 +751,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -718,6 +766,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
@@ -732,6 +781,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -781,6 +831,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0",
+              "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -791,6 +842,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
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 615a2a4b0cd..368298914ae 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
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -50,6 +52,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -60,6 +63,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -71,6 +75,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
+          "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -81,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -95,6 +101,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -109,6 +116,7 @@
               "match_coverage": 47.22,
               "matcher": "3-seq",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -123,6 +131,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -137,6 +146,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -148,6 +158,7 @@
         },
         {
           "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
+          "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
           "matches": [
             {
               "score": 75.0,
@@ -158,6 +169,7 @@
               "match_coverage": 75.0,
               "matcher": "3-seq",
               "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
               "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -172,6 +184,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
               "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -186,6 +199,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
               "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -197,6 +211,7 @@
         },
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 81.82,
@@ -207,6 +222,7 @@
               "match_coverage": 81.82,
               "matcher": "3-seq",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -218,6 +234,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -228,6 +245,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -263,6 +281,7 @@
     {
       "identifier": "cc_by_sa_3_0_and_cc_by_sa_4_0_and_dco_1_1-4fb8e409-441a-1243-5a0d-d6af2acc0c62",
       "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
+      "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -275,6 +294,7 @@
           "match_coverage": 75.0,
           "matcher": "3-seq",
           "license_expression": "cc-by-sa-3.0",
+          "license_expression_spdx": "CC-BY-SA-3.0",
           "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -289,6 +309,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-sa-4.0",
+          "license_expression_spdx": "CC-BY-SA-4.0",
           "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -303,6 +324,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "dco-1.1",
+          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
           "rule_identifier": "dco-1.1_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -313,6 +335,7 @@
     {
       "identifier": "gpl_1_0_plus-4347f44c-ada6-f802-86dd-14a96429fac1",
       "license_expression": "gpl-1.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -325,6 +348,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -335,6 +359,7 @@
     {
       "identifier": "gpl_1_0_plus_and_lgpl_3_0_plus_and_gpl_3_0_and_lgpl_3_0-3bd18dcd-0a4c-d46f-f42e-3d2919be9be0",
       "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
+      "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -347,6 +372,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -361,6 +387,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -375,6 +402,7 @@
           "match_coverage": 47.22,
           "matcher": "3-seq",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -389,6 +417,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_12.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -403,6 +432,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -413,6 +443,7 @@
     {
       "identifier": "gpl_2_0-29c387aa-50e0-0530-7b0b-aa32e3c372d6",
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -425,6 +456,7 @@
           "match_coverage": 81.82,
           "matcher": "3-seq",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -435,6 +467,7 @@
     {
       "identifier": "gpl_3_0-ab79e5a8-e510-cbf4-5302-ef968484bcdf",
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 3,
       "detection_log": [],
       "sample_matches": [
@@ -447,6 +480,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -457,6 +491,7 @@
     {
       "identifier": "gpl_3_0-db305a6e-7013-4ffa-0ad4-09f113582e67",
       "license_expression": "gpl-3.0",
+      "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 3,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -471,6 +506,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -485,6 +521,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -495,6 +532,7 @@
     {
       "identifier": "gpl_3_0_and_gpl_1_0_plus_and_lgpl_3_0_plus_and_lgpl_3_0_and_cc_by_sa_3_0_and_cc_by_sa_4_0_and_dco_1_1_and_gpl_2_0-c27079b5-2c85-9902-b997-c5f0081e9516",
       "license_expression": "gpl-3.0 AND gpl-1.0-plus AND lgpl-3.0-plus AND lgpl-3.0 AND cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1 AND gpl-2.0",
+      "license_expression_spdx": "GPL-3.0-only AND GPL-1.0-or-later AND LGPL-3.0-or-later AND LGPL-3.0-only AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1 AND GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -509,6 +547,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -523,6 +562,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -537,6 +577,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -551,6 +592,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -565,6 +607,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -579,6 +622,7 @@
           "match_coverage": 47.22,
           "matcher": "3-seq",
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -593,6 +637,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_12.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -607,6 +652,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -621,6 +667,7 @@
           "match_coverage": 75.0,
           "matcher": "3-seq",
           "license_expression": "cc-by-sa-3.0",
+          "license_expression_spdx": "CC-BY-SA-3.0",
           "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -635,6 +682,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-sa-4.0",
+          "license_expression_spdx": "CC-BY-SA-4.0",
           "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -649,6 +697,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "dco-1.1",
+          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
           "rule_identifier": "dco-1.1_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -663,6 +712,7 @@
           "match_coverage": 81.82,
           "matcher": "3-seq",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -677,6 +727,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -691,6 +742,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -701,6 +753,7 @@
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -713,6 +766,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -734,6 +788,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -744,6 +799,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -812,6 +868,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -822,6 +879,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -833,6 +891,7 @@
         },
         {
           "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
+          "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -843,6 +902,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -857,6 +917,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -871,6 +932,7 @@
               "match_coverage": 47.22,
               "matcher": "3-seq",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -885,6 +947,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -899,6 +962,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -910,6 +974,7 @@
         },
         {
           "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
+          "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
           "matches": [
             {
               "score": 75.0,
@@ -920,6 +985,7 @@
               "match_coverage": 75.0,
               "matcher": "3-seq",
               "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
               "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -934,6 +1000,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
               "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -948,6 +1015,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
               "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -968,6 +1036,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-3.0",
+          "spdx_license_expression": "GPL-3.0-only",
           "rule_identifier": "gpl-3.0_32.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_32.RULE",
@@ -982,6 +1051,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-3.0",
+          "spdx_license_expression": "LGPL-3.0-only",
           "rule_identifier": "lgpl-3.0_29.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -996,6 +1066,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_bare_single_word.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -1010,6 +1081,7 @@
           "match_coverage": 20.0,
           "matcher": "3-seq",
           "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_627.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_627.RULE",
@@ -1024,6 +1096,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown_88.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_88.RULE",
@@ -1045,6 +1118,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 81.82,
@@ -1055,6 +1129,7 @@
               "match_coverage": 81.82,
               "matcher": "3-seq",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -1066,6 +1141,7 @@
         },
         {
           "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1076,6 +1152,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -1090,6 +1167,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1139,6 +1217,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0",
+              "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1149,6 +1228,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1160,6 +1240,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -1170,6 +1251,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1181,6 +1263,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
+              "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1191,6 +1274,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -1205,6 +1289,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1219,6 +1304,7 @@
                   "match_coverage": 47.22,
                   "matcher": "3-seq",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -1233,6 +1319,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -1247,6 +1334,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
                   "rule_identifier": "lgpl-3.0_1.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -1258,6 +1346,7 @@
             },
             {
               "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
+              "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
               "matches": [
                 {
                   "score": 75.0,
@@ -1268,6 +1357,7 @@
                   "match_coverage": 75.0,
                   "matcher": "3-seq",
                   "license_expression": "cc-by-sa-3.0",
+                  "spdx_license_expression": "CC-BY-SA-3.0",
                   "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -1282,6 +1372,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "cc-by-sa-4.0",
+                  "spdx_license_expression": "CC-BY-SA-4.0",
                   "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -1296,6 +1387,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "dco-1.1",
+                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
                   "rule_identifier": "dco-1.1_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -1307,6 +1399,7 @@
             },
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 81.82,
@@ -1317,6 +1410,7 @@
                   "match_coverage": 81.82,
                   "matcher": "3-seq",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -1328,6 +1422,7 @@
             },
             {
               "license_expression": "gpl-3.0",
+              "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1338,6 +1433,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -1352,6 +1448,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1437,6 +1534,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0",
+              "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1447,6 +1545,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1458,6 +1557,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -1468,6 +1568,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1479,6 +1580,7 @@
             },
             {
               "license_expression": "gpl-1.0-plus AND lgpl-3.0-plus AND gpl-3.0 AND lgpl-3.0",
+              "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1489,6 +1591,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -1503,6 +1606,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1517,6 +1621,7 @@
                   "match_coverage": 47.22,
                   "matcher": "3-seq",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -1531,6 +1636,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -1545,6 +1651,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
                   "rule_identifier": "lgpl-3.0_1.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -1556,6 +1663,7 @@
             },
             {
               "license_expression": "cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1",
+              "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
               "matches": [
                 {
                   "score": 75.0,
@@ -1566,6 +1674,7 @@
                   "match_coverage": 75.0,
                   "matcher": "3-seq",
                   "license_expression": "cc-by-sa-3.0",
+                  "spdx_license_expression": "CC-BY-SA-3.0",
                   "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -1580,6 +1689,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "cc-by-sa-4.0",
+                  "spdx_license_expression": "CC-BY-SA-4.0",
                   "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -1594,6 +1704,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "dco-1.1",
+                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
                   "rule_identifier": "dco-1.1_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -1605,6 +1716,7 @@
             },
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 81.82,
@@ -1615,6 +1727,7 @@
                   "match_coverage": 81.82,
                   "matcher": "3-seq",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -1626,6 +1739,7 @@
             },
             {
               "license_expression": "gpl-3.0",
+              "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1636,6 +1750,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -1650,6 +1765,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
                   "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1742,6 +1858,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0 AND gpl-1.0-plus AND lgpl-3.0-plus AND lgpl-3.0 AND cc-by-sa-3.0 AND cc-by-sa-4.0 AND dco-1.1 AND gpl-2.0",
+          "license_expression_spdx": "GPL-3.0-only AND GPL-1.0-or-later AND LGPL-3.0-or-later AND LGPL-3.0-only AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1 AND GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -1752,6 +1869,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
               "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
@@ -1766,6 +1884,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1780,6 +1899,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1794,6 +1914,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
@@ -1808,6 +1929,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
@@ -1822,6 +1944,7 @@
               "match_coverage": 47.22,
               "matcher": "3-seq",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
@@ -1836,6 +1959,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
@@ -1850,6 +1974,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
               "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
@@ -1864,6 +1989,7 @@
               "match_coverage": 75.0,
               "matcher": "3-seq",
               "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
               "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
@@ -1878,6 +2004,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
               "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
@@ -1892,6 +2019,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
               "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
@@ -1906,6 +2034,7 @@
               "match_coverage": 81.82,
               "matcher": "3-seq",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
@@ -1920,6 +2049,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
@@ -1934,6 +2064,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
               "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
@@ -1962,6 +2093,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -1972,6 +2104,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
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 2380bdcc208..07b66c6f182 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 23c67add071..63c7318591a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 a754f287048..fcd6a8b4aa7 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_239.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_239.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
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 2fe5d32ce08..40c3d178859 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_239.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_239.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
diff --git a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json
index 7d01819f247..d09c22f7fdd 100644
--- a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json
+++ b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1277.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1277.RULE",
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 14afac57fbe..dac5ff25c62 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 49f86fee0b8..b7a65ef7c14 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
@@ -154,6 +154,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -164,6 +165,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 90b602f920e..2ec0a1d5a88 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
@@ -693,6 +693,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -703,6 +704,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 90bfcf34ae9..f441a5683e5 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_jcraft_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_jcraft_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_jcraft_3.RULE",
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 574d928cbf3..aa6d3d20b6e 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_jcraft_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE",
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 d0f98837874..aba0fcfe603 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 90.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_878.RULE",
           "rule_relevance": 90,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_878.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_xstream_maven_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_xstream_maven_4.RULE",
diff --git a/tests/packagedcode/data/m2/depman/foo.pom.package.json b/tests/packagedcode/data/m2/depman/foo.pom.package.json
index 6166ca8d28e..c1eaf3253c3 100644
--- a/tests/packagedcode/data/m2/depman/foo.pom.package.json
+++ b/tests/packagedcode/data/m2/depman/foo.pom.package.json
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
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 a9939336afd..94446fdd946 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
@@ -189,6 +189,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -199,6 +200,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 84a5b662cd3..6a7a01ca4be 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
@@ -70,6 +70,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -80,6 +81,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 96e989094bc..58df11c7983 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_363.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_363.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_82.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_82.RULE",
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 3c18d31a93b..9d4f99ad1b4 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1106.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1106.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1144.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1144.RULE",
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 5eb7264aeba..b326f822145 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
@@ -224,6 +224,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -234,6 +235,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 e6277e670ac..54aaedc912f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later",
       "matches": [
         {
           "score": 75.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_bare_single_word.RULE",
           "rule_relevance": 75,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_bare_single_word.RULE",
           "rule_relevance": 75,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
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 78e8a57e997..36d73c2c1a0 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "cddl-1.0",
+      "license_expression_spdx": "CDDL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "spdx_license_expression": "CDDL-1.0",
           "rule_identifier": "cddl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "spdx_license_expression": "CDDL-1.0",
           "rule_identifier": "cddl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
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 5fbfc69c040..8d17f23bd22 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "mpl-1.1 AND (mpl-1.1 OR lgpl-2.1-plus)",
+      "license_expression_spdx": "MPL-1.1 AND (MPL-1.1 OR LGPL-2.1-or-later)",
       "matches": [
         {
           "score": 50.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mpl-1.1",
+          "spdx_license_expression": "MPL-1.1",
           "rule_identifier": "spdx_license_id_mpl-1.1_for_mpl-1.1.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-1.1_for_mpl-1.1.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mpl-1.1 OR lgpl-2.1-plus",
+          "spdx_license_expression": "MPL-1.1 OR LGPL-2.1-or-later",
           "rule_identifier": "mpl-1.1_or_lgpl-2.1-plus_6.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-1.1_or_lgpl-2.1-plus_6.RULE",
@@ -73,6 +76,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mpl-1.1 OR lgpl-2.1-plus",
+          "spdx_license_expression": "MPL-1.1 OR LGPL-2.1-or-later",
           "rule_identifier": "mpl-1.1_or_lgpl-2.1-plus_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-1.1_or_lgpl-2.1-plus_5.RULE",
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 4d42fb2a173..412bba316d6 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 031c56bd15c..4d91d8fad62 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "tidy",
+      "license_expression_spdx": "HTMLTIDY",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "tidy",
+          "spdx_license_expression": "HTMLTIDY",
           "rule_identifier": "tidy_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tidy_2.RULE",
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 f59a8004edc..0983306d4af 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "cpl-1.0",
+      "license_expression_spdx": "CPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_5.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_10.RULE",
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 9b4d48ce4dd..4a2ba0b362b 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "cpl-1.0",
+      "license_expression_spdx": "CPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_5.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_10.RULE",
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 64494913298..b6fe7dc373a 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "cpl-1.0",
+      "license_expression_spdx": "CPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_5.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cpl-1.0",
+          "spdx_license_expression": "CPL-1.0",
           "rule_identifier": "cpl-1.0_10.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_10.RULE",
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 a76fdcda4bd..03cf9bcb2e3 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
@@ -532,6 +532,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -542,6 +543,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 162c87811b9..8c1be85ff20 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
@@ -609,6 +609,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -619,6 +620,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 65693ce2aba..ecb37fd6823 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 249c6c12360..82a06b90539 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
@@ -98,6 +98,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -108,6 +109,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 a5bf2c1da2c..4362d8997d9 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
@@ -119,6 +119,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -129,6 +130,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 1ab1e6410b7..46eae36784a 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "gpl-2.0 WITH mysql-linking-exception-2018",
+      "license_expression_spdx": "GPL-2.0-only WITH LicenseRef-scancode-mysql-linking-exception-2018",
       "matches": [
         {
           "score": 90.2,
@@ -37,6 +38,7 @@
           "match_coverage": 90.2,
           "matcher": "3-seq",
           "license_expression": "gpl-2.0 WITH mysql-linking-exception-2018",
+          "spdx_license_expression": "GPL-2.0-only WITH LicenseRef-scancode-mysql-linking-exception-2018",
           "rule_identifier": "gpl-2.0_with_mysql-linking-exception-2018_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_mysql-linking-exception-2018_3.RULE",
@@ -47,6 +49,7 @@
     },
     {
       "license_expression": "unknown",
+      "license_expression_spdx": "LicenseRef-scancode-unknown",
       "matches": [
         {
           "score": 96.3,
@@ -57,6 +60,7 @@
           "match_coverage": 100.0,
           "matcher": "5-undetected",
           "license_expression": "unknown",
+          "spdx_license_expression": "LicenseRef-scancode-unknown",
           "rule_identifier": "package-manifest-unknown-91b1be345430234b155decbb3e945d9349c09ea1",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-91b1be345430234b155decbb3e945d9349c09ea1",
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 b09312db0b1..fff33bc6ad7 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
@@ -77,6 +77,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -87,6 +88,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
@@ -101,6 +103,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_222.RULE",
           "rule_relevance": 90,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_222.RULE",
@@ -115,6 +118,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_228.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_228.RULE",
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 eaec56ef6dd..5a6b013ca18 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
@@ -42,6 +42,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 99.0,
@@ -52,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_145.RULE",
           "rule_relevance": 99,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_145.RULE",
@@ -66,6 +68,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_335.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_335.RULE",
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 2eb1389f962..8c1e86aa460 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
@@ -231,6 +231,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -241,6 +242,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 7d9e093bea0..f273b3a924f 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
@@ -231,6 +231,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -241,6 +242,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 6e22ab55041..13c08b37a6f 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
@@ -49,6 +49,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1 AND lgpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.1-only AND LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -59,6 +60,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1",
+          "spdx_license_expression": "LGPL-2.1-only",
           "rule_identifier": "lgpl-2.1_85.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_85.RULE",
@@ -73,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
@@ -87,6 +90,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1",
+          "spdx_license_expression": "LGPL-2.1-only",
           "rule_identifier": "lgpl-2.1_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_36.RULE",
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 cba9f6fd228..84549df372e 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 181ed07a4bb..249c570ee0f 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 20be3d0492a..854b1fc9e54 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 902cf818ca7..9cdf8317304 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
@@ -70,6 +70,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -80,6 +81,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_182.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_182.RULE",
@@ -94,6 +96,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
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 5c407b89b68..a284860b4e8 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 62ccaa2088a..c71c5f34f5b 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
@@ -91,6 +91,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -101,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 08eea224eaa..29e840cc599 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
@@ -91,6 +91,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -101,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 abf24a9d510..8b3a2d0bf7f 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
@@ -91,6 +91,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -101,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 e8d1b11bde6..7d6861f36d6 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
@@ -91,6 +91,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -101,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 278554ce7f9..e1bfa08c79b 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
@@ -49,6 +49,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -59,6 +60,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1039.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1039.RULE",
@@ -73,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
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 cca5937fdbd..2aa578c9352 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 005d8b25148..bc887787684 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 75ca1f9adc1..04cee507729 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 cbed714e171..c5b8e34a5e9 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 2cceeeeaf84..2ff2338478c 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 5d71429f10f..944329b260f 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_176.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_176.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
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 26734b89702..e5a5de8d1dc 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
@@ -294,6 +294,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -304,6 +305,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 04368ac6b51..97e648acaac 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
@@ -70,6 +70,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -80,6 +81,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 96436e871f9..bfd6d8f3eaf 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 40ea019f46b..f8381e40978 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 184920e4442..aff1c06a3be 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 97844d0fe2e..9b0746fe38f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 9813f1f260d..5d3b9358759 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 3158446c3db..6f43c2015f7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 aa589b50de2..51d06b77e4e 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
@@ -42,6 +42,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -52,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_27.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE",
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 56eccb51202..8a5049bc41e 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_27.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_237.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_237.RULE",
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 56eccb51202..8a5049bc41e 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_27.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_237.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_237.RULE",
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 a37d0780742..df3784d9c9c 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
@@ -49,6 +49,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -59,6 +60,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 31dd08ab6d5..77701300278 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1160.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
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 278fddbb2c8..35176e6358a 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_27.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1165.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1165.RULE",
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 009adb82369..bf18bc995cd 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
@@ -161,6 +161,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -171,6 +172,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 15c604403f2..07f442e536b 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1106.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1106.RULE",
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 973fff1db1b..eea0c9bd2d3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1106.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1106.RULE",
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 940e6a26a64..53bbbfa6efa 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 ae1064308ea..6e5b1760450 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 badc2aee5e1..3aefb1321a1 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 53f234cc445..2eb8f518d2c 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 14767ef2801..c4a1a61877f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 2a7615a0b88..7e0ad50ca31 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 df5762e213a..5d59e3e3cf1 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_482.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_482.RULE",
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 e206a6d5e49..b12656afebd 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
@@ -112,6 +112,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -122,6 +123,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -136,6 +138,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
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 4b759a12066..3e8fa643870 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
@@ -91,6 +91,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -101,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -115,6 +117,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_25.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
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 5ea1893ea2f..1b47412226f 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "cddl-1.0",
+      "license_expression_spdx": "CDDL-1.0",
       "matches": [
         {
           "score": 95.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "spdx_license_expression": "CDDL-1.0",
           "rule_identifier": "spdx_license_id_cddl-1.0_for_cddl-1.0.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_cddl-1.0_for_cddl-1.0.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cddl-1.0",
+          "spdx_license_expression": "CDDL-1.0",
           "rule_identifier": "cddl-1.0_6.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_6.RULE",
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 2184f57c4d6..433b8f7b711 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 d8ec4d34e0b..2e3a2558be2 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 1deeaadad1e..bb10218f8ea 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 a5b4a4dedda..4fe7331c788 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 4393fe85c5c..c18a6d2f1bf 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 d9d7d95b8b7..f63a39aa37a 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 aaacb87ef47..0123c27e457 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 403369abaec..d571c0eeff6 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 bbd91d2ec6f..f8bee51384f 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 a3f40d1fccb..62291235714 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 5ec42fdbdbe..b75c7646bea 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 41b8ae4596a..56d040f7d82 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 25a7ba9e7cc..0f071df313c 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 bfa42521549..0f158196afa 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 967214543f5..22ff1ee28c9 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 6efd2afd000..08928f34fda 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 63fe5bf815d..386e4fe3178 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_url_6.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_url_6.RULE",
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 c15c02f2d99..20180caa2ad 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_url_6.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_url_6.RULE",
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 78bc1ca800f..78ba344d129 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
@@ -63,6 +63,7 @@
   "license_detections": [
     {
       "license_expression": "apache-1.1",
+      "license_expression_spdx": "Apache-1.1",
       "matches": [
         {
           "score": 100.0,
@@ -73,6 +74,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-1.1",
+          "spdx_license_expression": "Apache-1.1",
           "rule_identifier": "apache-1.1_66.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_66.RULE",
@@ -87,6 +89,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-1.1",
+          "spdx_license_expression": "Apache-1.1",
           "rule_identifier": "apache-1.1_64.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_64.RULE",
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 15d16007396..c858f11fba1 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_358.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_358.RULE",
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 54d8a6e109b..6956971c542 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "bsd-new",
+          "spdx_license_expression": "BSD-3-Clause",
           "rule_identifier": "bsd-new_358.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_358.RULE",
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 a0bd61c449a..d3ee8a00fb0 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 10bfbe0b842..d1c28fc19b7 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 c44fc490eee..ac4bdbbac1b 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
@@ -252,6 +252,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -262,6 +263,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 bc3eef00da7..e5558b8c783 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
@@ -259,6 +259,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -269,6 +270,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 c76706f4a68..3c6a8c66d9a 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 8e56aad0396..4de1083aec2 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 11af95ada2a..4379d11fe23 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain AND sax-pd",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain AND SAX-PD",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "sax-pd",
+          "spdx_license_expression": "SAX-PD",
           "rule_identifier": "sax-pd_url_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sax-pd_url_4.RULE",
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 f64ea7e58eb..1a00414c317 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "public-domain AND gpl-1.0-plus",
+      "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
       "matches": [
         {
           "score": 70.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
           "rule_identifier": "public-domain_bare_words.RULE",
           "rule_relevance": 70,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
           "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
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 c44fc490eee..ac4bdbbac1b 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
@@ -252,6 +252,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -262,6 +263,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_1316.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
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 31dd08ab6d5..77701300278 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
@@ -56,6 +56,7 @@
   "license_detections": [
     {
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "matches": [
         {
           "score": 100.0,
@@ -66,6 +67,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "spdx_license_expression": "MIT",
           "rule_identifier": "mit_1160.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
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 2e889027e52..75f056dab53 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "epl-1.0",
+      "license_expression_spdx": "EPL-1.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "epl-1.0",
+          "spdx_license_expression": "EPL-1.0",
           "rule_identifier": "epl-1.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
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 09e5e1cc9ec..371732ce280 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0-plus AND lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
           "score": 75.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_bare_single_word.RULE",
           "rule_relevance": 75,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -59,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "spdx_license_expression": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl_7.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
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 65693ce2aba..ecb37fd6823 100644
--- a/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 47911e414b0..cd6685161f3 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
@@ -27,6 +27,7 @@
   "license_detections": [
     {
       "license_expression": "lgpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later",
       "matches": [
         {
           "score": 100.0,
@@ -37,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -51,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-or-later",
           "rule_identifier": "lgpl_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
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 6efd2afd000..08928f34fda 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 bbd91d2ec6f..f8bee51384f 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 bfa42521549..0f158196afa 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
@@ -35,6 +35,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -45,6 +46,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "apache-2.0_40.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 204cb2c214e..e501a716e94 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -57,6 +59,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -67,6 +70,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
@@ -80,6 +84,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -116,6 +121,7 @@
     {
       "identifier": "apache_2_0-31344ceb-eee7-3f95-45bb-cc86209f76f8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [
         "unknown-reference-to-local-file"
@@ -130,6 +136,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_375.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE",
@@ -144,6 +151,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_394.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
@@ -154,6 +162,7 @@
     {
       "identifier": "apache_2_0-8607fc22-7931-3e71-b7d5-bd208970dc6f",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
       "sample_matches": [
@@ -166,6 +175,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_394.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
@@ -213,6 +223,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -223,6 +234,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -274,6 +286,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -284,6 +297,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_394.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -294,6 +308,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -304,6 +319,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_375.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
@@ -317,6 +333,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_394.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -366,6 +383,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -376,6 +394,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
@@ -389,6 +408,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
@@ -410,6 +430,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "free-unknown",
+          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
           "rule_identifier": "free-unknown_85.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_85.RULE"
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 e8b3c09660c..0383f53b815 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
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -232,6 +234,7 @@
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [
         "from-package-file"
@@ -246,6 +249,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -256,6 +260,7 @@
     {
       "identifier": "apache_2_0-2e855fd2-d4e6-f202-a2a4-6953b9354518",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -268,6 +273,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -278,6 +284,7 @@
     {
       "identifier": "apache_2_0-482220ca-c07b-bf59-66ed-6e7eaf9f3b1e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -290,6 +297,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_product_includes_2.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
@@ -300,6 +308,7 @@
     {
       "identifier": "apache_2_0-8352cbe6-d199-3a43-cdc8-b14a837e2ce6",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -312,6 +321,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_osgi.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE",
@@ -322,6 +332,7 @@
     {
       "identifier": "apache_2_0-aef5c472-cdfd-dc5f-c152-40e3d96f140e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -334,6 +345,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_791.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
@@ -344,6 +356,7 @@
     {
       "identifier": "apache_2_0-f089be2e-5d2c-9289-8733-3880be15665c",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -356,6 +369,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1247.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE",
@@ -405,6 +419,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 64.18,
@@ -415,6 +430,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1247.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE"
@@ -440,6 +456,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -450,6 +467,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
@@ -501,6 +519,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -511,6 +530,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -546,6 +566,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -556,6 +577,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_osgi.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE"
@@ -581,6 +603,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -591,6 +614,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
@@ -736,6 +760,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -746,6 +771,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -894,6 +920,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -904,6 +931,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
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 2235fbd90a0..ad9fa921c5a 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
@@ -44,6 +44,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -54,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_203.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
@@ -105,6 +107,7 @@
     {
       "identifier": "cc0_1_0-15f5e40e-1981-f373-7acf-8ebdfa09ee21",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -117,6 +120,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_197.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE",
@@ -127,6 +131,7 @@
     {
       "identifier": "cc0_1_0-6bdf45cc-fe1e-2f20-02e3-fbae31f10c0e",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -139,6 +144,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_203.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
@@ -380,6 +386,7 @@
           "license_detections": [
             {
               "license_expression": "cc0-1.0",
+              "license_expression_spdx": "CC0-1.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -390,6 +397,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "cc0-1.0",
+                  "spdx_license_expression": "CC0-1.0",
                   "rule_identifier": "cc0-1.0_203.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
@@ -436,6 +444,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -446,6 +455,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_197.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE"
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 c261e3175d8..cb164b2d4fe 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
@@ -56,6 +58,7 @@
         },
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -66,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
@@ -266,6 +270,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -276,6 +281,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -334,6 +340,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -344,6 +351,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -576,6 +584,7 @@
     {
       "identifier": "apache_2_0-4bde3f57-78aa-4201-96bf-531cba09e7de",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 4,
       "sample_matches": [
         {
@@ -587,6 +596,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
@@ -597,6 +607,7 @@
     {
       "identifier": "apache_2_0-482220ca-c07b-bf59-66ed-6e7eaf9f3b1e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -608,6 +619,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_product_includes_2.RULE",
           "rule_relevance": 95,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
@@ -618,6 +630,7 @@
     {
       "identifier": "apache_2_0-aef5c472-cdfd-dc5f-c152-40e3d96f140e",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -629,6 +642,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_791.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
@@ -639,6 +653,7 @@
     {
       "identifier": "apache_2_0-e7633baf-a264-a1ab-40f6-a28ec157067a",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -650,6 +665,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
@@ -664,6 +680,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
@@ -678,6 +695,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
@@ -692,6 +710,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
@@ -739,6 +758,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -749,6 +769,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
@@ -762,6 +783,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
@@ -775,6 +797,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
@@ -788,6 +811,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
@@ -812,6 +836,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -822,6 +847,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
@@ -872,6 +898,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -882,6 +909,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_791.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
@@ -891,6 +919,7 @@
             },
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 95.0,
@@ -901,6 +930,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_product_includes_2.RULE",
                   "rule_relevance": 95,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
@@ -947,6 +977,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 95.0,
@@ -957,6 +988,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
@@ -1331,6 +1363,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1341,6 +1374,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -1427,6 +1461,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1437,6 +1472,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -1510,6 +1546,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -1520,6 +1557,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
@@ -1596,6 +1634,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1606,6 +1645,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
diff --git a/tests/packagedcode/data/models/full-expected.json b/tests/packagedcode/data/models/full-expected.json
index 3a2addd15ca..9be83f05432 100644
--- a/tests/packagedcode/data/models/full-expected.json
+++ b/tests/packagedcode/data/models/full-expected.json
@@ -42,6 +42,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -52,6 +53,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
diff --git a/tests/packagedcode/data/models/simple-expected.json b/tests/packagedcode/data/models/simple-expected.json
index 16445f46dc7..f3673758433 100644
--- a/tests/packagedcode/data/models/simple-expected.json
+++ b/tests/packagedcode/data/models/simple-expected.json
@@ -38,6 +38,7 @@
   "license_detections": [
     {
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "matches": [
         {
           "score": 100.0,
@@ -48,6 +49,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "spdx_license_expression": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
diff --git a/tests/packagedcode/data/npm/as_installed/package.json.expected b/tests/packagedcode/data/npm/as_installed/package.json.expected
index c20208e3990..1b44fc962ef 100644
--- a/tests/packagedcode/data/npm/as_installed/package.json.expected
+++ b/tests/packagedcode/data/npm/as_installed/package.json.expected
@@ -2211,6 +2211,7 @@
     "license_detections": [
       {
         "license_expression": "artistic-2.0",
+        "license_expression_spdx": "Artistic-2.0",
         "matches": [
           {
             "score": 50.0,
@@ -2221,6 +2222,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "artistic-2.0",
+            "spdx_license_expression": "Artistic-2.0",
             "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
             "rule_relevance": 50,
             "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",
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 780217f2b98..3ccc7f55c13 100644
--- a/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected
+++ b/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected
@@ -56,6 +56,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -66,6 +67,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -76,6 +78,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -86,6 +89,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
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 812aab73f35..f6808e67677 100644
--- a/tests/packagedcode/data/npm/authors_list_strings/package.json.expected
+++ b/tests/packagedcode/data/npm/authors_list_strings/package.json.expected
@@ -54,6 +54,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -64,6 +65,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/casepath/package.json.expected b/tests/packagedcode/data/npm/casepath/package.json.expected
index 417faebd2bd..8df03893337 100644
--- a/tests/packagedcode/data/npm/casepath/package.json.expected
+++ b/tests/packagedcode/data/npm/casepath/package.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/chartist/package.json.expected b/tests/packagedcode/data/npm/chartist/package.json.expected
index 6aa2c1f8371..dffea3c9a4b 100644
--- a/tests/packagedcode/data/npm/chartist/package.json.expected
+++ b/tests/packagedcode/data/npm/chartist/package.json.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "mit OR wtfpl-2.0",
+        "license_expression_spdx": "MIT OR WTFPL",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit OR wtfpl-2.0",
+            "spdx_license_expression": "MIT OR WTFPL",
             "rule_identifier": "spdx-license-identifier-mit OR wtfpl-2.0-a3a16f7e12d6ecec29951dd1a41d0d4dbd91e112",
             "rule_relevance": 100,
             "rule_url": null,
@@ -61,6 +63,7 @@
       },
       {
         "license_expression": "wtfpl-2.0",
+        "license_expression_spdx": "WTFPL",
         "matches": [
           {
             "score": 50.0,
@@ -71,6 +74,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "wtfpl-2.0",
+            "spdx_license_expression": "WTFPL",
             "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
@@ -81,6 +85,7 @@
       },
       {
         "license_expression": "wtfpl-2.0",
+        "license_expression_spdx": "WTFPL",
         "matches": [
           {
             "score": 100.0,
@@ -91,6 +96,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "wtfpl-2.0",
+            "spdx_license_expression": "WTFPL",
             "rule_identifier": "wtfpl-2.0_33.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_33.RULE",
@@ -101,6 +107,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -111,6 +118,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -121,6 +129,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -131,6 +140,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
diff --git a/tests/packagedcode/data/npm/dist/package.json.expected b/tests/packagedcode/data/npm/dist/package.json.expected
index 64df5e99b62..e2a611a2a56 100644
--- a/tests/packagedcode/data/npm/dist/package.json.expected
+++ b/tests/packagedcode/data/npm/dist/package.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/double_license/package.json.expected b/tests/packagedcode/data/npm/double_license/package.json.expected
index b0639f735c4..de58a332c67 100644
--- a/tests/packagedcode/data/npm/double_license/package.json.expected
+++ b/tests/packagedcode/data/npm/double_license/package.json.expected
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -58,6 +60,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -68,6 +71,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
diff --git a/tests/packagedcode/data/npm/electron/package.expected.json b/tests/packagedcode/data/npm/electron/package.expected.json
index 5e1da273166..83985823078 100644
--- a/tests/packagedcode/data/npm/electron/package.expected.json
+++ b/tests/packagedcode/data/npm/electron/package.expected.json
@@ -39,6 +39,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -49,6 +50,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -224,6 +226,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -234,6 +237,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
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 90868ad1a03..ee6267c23ae 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
@@ -47,6 +47,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -57,6 +58,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -67,6 +69,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -77,6 +80,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_13.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_13.RULE",
diff --git a/tests/packagedcode/data/npm/from_npmjs/package.json.expected b/tests/packagedcode/data/npm/from_npmjs/package.json.expected
index dfd6808c21e..9182fc7f42f 100644
--- a/tests/packagedcode/data/npm/from_npmjs/package.json.expected
+++ b/tests/packagedcode/data/npm/from_npmjs/package.json.expected
@@ -2211,6 +2211,7 @@
     "license_detections": [
       {
         "license_expression": "artistic-2.0",
+        "license_expression_spdx": "Artistic-2.0",
         "matches": [
           {
             "score": 50.0,
@@ -2221,6 +2222,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "artistic-2.0",
+            "spdx_license_expression": "Artistic-2.0",
             "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
             "rule_relevance": 50,
             "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",
diff --git a/tests/packagedcode/data/npm/from_tarball/package.json.expected b/tests/packagedcode/data/npm/from_tarball/package.json.expected
index d1a0ed4eff6..59f8290a2db 100644
--- a/tests/packagedcode/data/npm/from_tarball/package.json.expected
+++ b/tests/packagedcode/data/npm/from_tarball/package.json.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "artistic-2.0",
+        "license_expression_spdx": "Artistic-2.0",
         "matches": [
           {
             "score": 50.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "artistic-2.0",
+            "spdx_license_expression": "Artistic-2.0",
             "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
             "rule_relevance": 50,
             "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",
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 e467d8c503d..5e2a4c41213 100644
--- a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json
+++ b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -124,6 +126,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -134,6 +137,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
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 fe8e81d7f1d..5a36885d36c 100644
--- a/tests/packagedcode/data/npm/homepage-as-list/package.json.expected
+++ b/tests/packagedcode/data/npm/homepage-as-list/package.json.expected
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/invalid-dep/package.json.expected b/tests/packagedcode/data/npm/invalid-dep/package.json.expected
index 10aeb31b306..53df6dcc864 100644
--- a/tests/packagedcode/data/npm/invalid-dep/package.json.expected
+++ b/tests/packagedcode/data/npm/invalid-dep/package.json.expected
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/keywords/package.json.expected b/tests/packagedcode/data/npm/keywords/package.json.expected
index f5b7289156a..066341342f4 100644
--- a/tests/packagedcode/data/npm/keywords/package.json.expected
+++ b/tests/packagedcode/data/npm/keywords/package.json.expected
@@ -60,6 +60,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -70,6 +71,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 bc670149801..3ec4a2fba5e 100644
--- a/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected
+++ b/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
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 7afda78b4b5..a683a05a509 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
@@ -46,6 +46,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -56,6 +57,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 be43e3091a6..2c860c5d9d8 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
@@ -73,6 +73,7 @@
           "license_detections": [
             {
               "license_expression": "isc",
+              "license_expression_spdx": "ISC",
               "matches": [
                 {
                   "score": 100.0,
@@ -83,6 +84,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "isc",
+                  "spdx_license_expression": "ISC",
                   "rule_identifier": "spdx-license-identifier-isc-9931cb7ad33c2eb18f322c94660b670a84186baa",
                   "rule_relevance": 100,
                   "rule_url": null,
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 601b9f91c82..e753c7b7710 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
@@ -73,6 +73,7 @@
           "license_detections": [
             {
               "license_expression": "isc",
+              "license_expression_spdx": "ISC",
               "matches": [
                 {
                   "score": 100.0,
@@ -83,6 +84,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "isc",
+                  "spdx_license_expression": "ISC",
                   "rule_identifier": "spdx-license-identifier-isc-9931cb7ad33c2eb18f322c94660b670a84186baa",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/npm/scan-nested/scan.expected.json b/tests/packagedcode/data/npm/scan-nested/scan.expected.json
index 8803bbd980a..34f5351c090 100644
--- a/tests/packagedcode/data/npm/scan-nested/scan.expected.json
+++ b/tests/packagedcode/data/npm/scan-nested/scan.expected.json
@@ -61,6 +61,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +72,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -168,6 +170,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -178,6 +181,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1135,6 +1139,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1145,6 +1150,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1803,6 +1809,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1813,6 +1820,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/npm/scoped1/package.json.expected b/tests/packagedcode/data/npm/scoped1/package.json.expected
index 53ae0704c3e..ed6caa72a4c 100644
--- a/tests/packagedcode/data/npm/scoped1/package.json.expected
+++ b/tests/packagedcode/data/npm/scoped1/package.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/scoped2/package.json.expected b/tests/packagedcode/data/npm/scoped2/package.json.expected
index 791c86cf074..125e6b2b3f1 100644
--- a/tests/packagedcode/data/npm/scoped2/package.json.expected
+++ b/tests/packagedcode/data/npm/scoped2/package.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/sequelize/package.json.expected b/tests/packagedcode/data/npm/sequelize/package.json.expected
index 47af0956b0d..94aa03c689f 100644
--- a/tests/packagedcode/data/npm/sequelize/package.json.expected
+++ b/tests/packagedcode/data/npm/sequelize/package.json.expected
@@ -73,6 +73,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -83,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/npm/uri_vcs/package.json.expected b/tests/packagedcode/data/npm/uri_vcs/package.json.expected
index 8de2fdb2324..cb0a91a7dae 100644
--- a/tests/packagedcode/data/npm/uri_vcs/package.json.expected
+++ b/tests/packagedcode/data/npm/uri_vcs/package.json.expected
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -56,6 +58,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -66,6 +69,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_13.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_13.RULE",
diff --git a/tests/packagedcode/data/npm/urls_dict/package.json.expected b/tests/packagedcode/data/npm/urls_dict/package.json.expected
index f5418b48035..a0479e019a7 100644
--- a/tests/packagedcode/data/npm/urls_dict/package.json.expected
+++ b/tests/packagedcode/data/npm/urls_dict/package.json.expected
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 bc83684f04e..19d44b6dd54 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
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -58,6 +60,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -68,6 +71,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_13.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_13.RULE",
diff --git a/tests/packagedcode/data/npm/with_name/package.json.expected b/tests/packagedcode/data/npm/with_name/package.json.expected
index 52e6fc67a4e..b38dd654b82 100644
--- a/tests/packagedcode/data/npm/with_name/package.json.expected
+++ b/tests/packagedcode/data/npm/with_name/package.json.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_48.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -48,6 +50,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_25.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_25.RULE",
diff --git a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected
index 4a94565f7de..d43ce08d627 100644
--- a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_20.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_20.RULE",
diff --git a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected
index d0499809286..7645947a2b6 100644
--- a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "ms-net-library",
+        "license_expression_spdx": "LicenseRef-scancode-ms-net-library",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "ms-net-library",
+            "spdx_license_expression": "LicenseRef-scancode-ms-net-library",
             "rule_identifier": "ms-net-library_6.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ms-net-library_6.RULE",
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 7df8ba1f34c..38439b23a38 100644
--- a/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "ms-net-library",
+        "license_expression_spdx": "LicenseRef-scancode-ms-net-library",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "ms-net-library",
+            "spdx_license_expression": "LicenseRef-scancode-ms-net-library",
             "rule_identifier": "ms-net-library_1.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ms-net-library_1.RULE",
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 c2d94a9fcf4..bf26eb3b7c7 100644
--- a/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "ms-net-library-2018-11",
+        "license_expression_spdx": "LicenseRef-scancode-ms-net-library-2018-11",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "ms-net-library-2018-11",
+            "spdx_license_expression": "LicenseRef-scancode-ms-net-library-2018-11",
             "rule_identifier": "ms-net-library-2018-11_3.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ms-net-library-2018-11_3.RULE",
diff --git a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected
index 29307252578..0d2413dc1a4 100644
--- a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_180.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_180.RULE",
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 ffa78805483..fcb9f255b93 100644
--- a/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected
+++ b/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 80.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_jquery_url.RULE",
             "rule_relevance": 80,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_jquery_url.RULE",
diff --git a/tests/packagedcode/data/opam/sample1/output.opam.expected b/tests/packagedcode/data/opam/sample1/output.opam.expected
index cb046ddbf8e..ce658586488 100644
--- a/tests/packagedcode/data/opam/sample1/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample1/output.opam.expected
@@ -113,6 +113,7 @@
     "license_detections": [
       {
         "license_expression": "isc",
+        "license_expression_spdx": "ISC",
         "matches": [
           {
             "score": 100.0,
@@ -123,6 +124,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "isc",
+            "spdx_license_expression": "ISC",
             "rule_identifier": "spdx-license-identifier-isc-9931cb7ad33c2eb18f322c94660b670a84186baa",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/opam/sample3/output.opam.expected b/tests/packagedcode/data/opam/sample3/output.opam.expected
index f0d17edf9b8..5fd0981e76e 100644
--- a/tests/packagedcode/data/opam/sample3/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample3/output.opam.expected
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 50.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-only_for_gpl-3.0.RULE",
diff --git a/tests/packagedcode/data/opam/sample4/output.opam.expected b/tests/packagedcode/data/opam/sample4/output.opam.expected
index c1586a5d933..571edecb3aa 100644
--- a/tests/packagedcode/data/opam/sample4/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample4/output.opam.expected
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+        "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
             "score": 100.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
             "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/opam/sample5/output.opam.expected b/tests/packagedcode/data/opam/sample5/output.opam.expected
index f4a1a0885bc..65d10987118 100644
--- a/tests/packagedcode/data/opam/sample5/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample5/output.opam.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/opam/sample6/output.opam.expected b/tests/packagedcode/data/opam/sample6/output.opam.expected
index eafb1b07aaa..1664ea40426 100644
--- a/tests/packagedcode/data/opam/sample6/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample6/output.opam.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_52.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
diff --git a/tests/packagedcode/data/opam/sample7/output.opam.expected b/tests/packagedcode/data/opam/sample7/output.opam.expected
index 1b05e022fb8..06f4faa1f4d 100644
--- a/tests/packagedcode/data/opam/sample7/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample7/output.opam.expected
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+        "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
             "score": 100.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
             "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/opam/sample8/output.opam.expected b/tests/packagedcode/data/opam/sample8/output.opam.expected
index c1586a5d933..571edecb3aa 100644
--- a/tests/packagedcode/data/opam/sample8/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample8/output.opam.expected
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+        "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
             "score": 100.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
             "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
index 81b46bab60d..661a34b6803 100644
--- a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json
index dac350a1078..664f42d19a6 100644
--- a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json
+++ b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json
@@ -414,6 +414,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -424,6 +425,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -543,6 +545,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -553,6 +556,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -662,6 +666,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -672,6 +677,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -791,6 +797,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -801,6 +808,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -930,6 +938,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -940,6 +949,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1036,6 +1046,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1046,6 +1057,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1245,6 +1257,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1255,6 +1268,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1358,6 +1372,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1368,6 +1383,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1461,6 +1477,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1471,6 +1488,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1570,6 +1588,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1580,6 +1599,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1707,6 +1727,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1717,6 +1738,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1840,6 +1862,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1850,6 +1873,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -1946,6 +1970,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -1956,6 +1981,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -2345,6 +2371,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -2355,6 +2382,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -2468,6 +2496,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -2478,6 +2507,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -2570,6 +2600,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -2580,6 +2611,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -2699,6 +2731,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -2709,6 +2742,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -2788,6 +2822,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -2798,6 +2833,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -2924,6 +2960,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -2934,6 +2971,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3170,6 +3208,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3180,6 +3219,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3296,6 +3336,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3306,6 +3347,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3472,6 +3514,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3482,6 +3525,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3578,6 +3622,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3588,6 +3633,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3674,6 +3720,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3684,6 +3731,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3770,6 +3818,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3780,6 +3829,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3876,6 +3926,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3886,6 +3937,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -3982,6 +4034,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -3992,6 +4045,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -4088,6 +4142,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -4098,6 +4153,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -4184,6 +4240,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -4194,6 +4251,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -4280,6 +4338,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -4290,6 +4349,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
index ef02525abd4..8300a54d755 100644
--- a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.1 OR gpl-3.0-plus",
+        "license_expression_spdx": "LGPL-2.1-only OR GPL-3.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "lgpl-2.1 OR gpl-3.0-plus",
+            "spdx_license_expression": "LGPL-2.1-only OR GPL-3.0-or-later",
             "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR gpl-3.0-plus-4447537ab02d07e1156b062adaf7b9e2ba3f55de",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected
index 9418f1862d1..f0733bfa3cd 100644
--- a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.1",
+        "license_expression_spdx": "LGPL-2.1-only",
         "matches": [
           {
             "score": 50.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
             "rule_identifier": "spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_lgpl-2.1-only_for_lgpl-2.1.RULE",
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "gpl-3.0-plus",
+        "license_expression_spdx": "GPL-3.0-or-later",
         "matches": [
           {
             "score": 50.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0-plus",
+            "spdx_license_expression": "GPL-3.0-or-later",
             "rule_identifier": "spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-3.0-or-later_for_gpl-3.0-plus.RULE",
diff --git a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
index 695130f1820..e60ebd95d2f 100644
--- a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
index 582e9cf6fdb..d1f8c5b670e 100644
--- a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "proprietary-license",
+        "license_expression_spdx": "LicenseRef-scancode-proprietary-license",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "proprietary-license",
+            "spdx_license_expression": "LicenseRef-scancode-proprietary-license",
             "rule_identifier": "proprietary_8.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary_8.RULE",
diff --git a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
index 4d5ec9fadcc..d381a9952ff 100644
--- a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
@@ -64,6 +64,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -74,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/about-package-expected.json b/tests/packagedcode/data/plugin/about-package-expected.json
index 19627c232bd..78c54d72497 100644
--- a/tests/packagedcode/data/plugin/about-package-expected.json
+++ b/tests/packagedcode/data/plugin/about-package-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
               "rule_url": null,
@@ -215,6 +219,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -225,6 +230,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -306,6 +312,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -316,6 +323,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/bower-package-expected.json b/tests/packagedcode/data/plugin/bower-package-expected.json
index 417972ece46..0822c77ef0b 100644
--- a/tests/packagedcode/data/plugin/bower-package-expected.json
+++ b/tests/packagedcode/data/plugin/bower-package-expected.json
@@ -41,6 +41,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +52,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -170,6 +172,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -180,6 +183,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/cargo-package-expected.json b/tests/packagedcode/data/plugin/cargo-package-expected.json
index 093111a6517..5f237adcd8b 100644
--- a/tests/packagedcode/data/plugin/cargo-package-expected.json
+++ b/tests/packagedcode/data/plugin/cargo-package-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -119,6 +121,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -129,6 +132,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json
index f651a998235..02f362bb98e 100644
--- a/tests/packagedcode/data/plugin/chef-package-expected.json
+++ b/tests/packagedcode/data/plugin/chef-package-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -150,6 +152,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -160,6 +163,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -242,6 +246,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -252,6 +257,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/com-package-expected.json b/tests/packagedcode/data/plugin/com-package-expected.json
index 43c6660822c..68d04d9c98d 100644
--- a/tests/packagedcode/data/plugin/com-package-expected.json
+++ b/tests/packagedcode/data/plugin/com-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
diff --git a/tests/packagedcode/data/plugin/conda-package-expected.json b/tests/packagedcode/data/plugin/conda-package-expected.json
index b3ff9f94035..466a6df7ff8 100644
--- a/tests/packagedcode/data/plugin/conda-package-expected.json
+++ b/tests/packagedcode/data/plugin/conda-package-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "matches": [
             {
               "score": 80.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown_license_other_12.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_license_other_12.RULE",
@@ -299,6 +301,7 @@
           "license_detections": [
             {
               "license_expression": "unknown-license-reference",
+              "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
               "matches": [
                 {
                   "score": 80.0,
@@ -309,6 +312,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown_license_other_12.RULE",
                   "rule_relevance": 80,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_license_other_12.RULE",
diff --git a/tests/packagedcode/data/plugin/cran-package-expected.json b/tests/packagedcode/data/plugin/cran-package-expected.json
index 8ff3e7f00dc..598503af1e8 100644
--- a/tests/packagedcode/data/plugin/cran-package-expected.json
+++ b/tests/packagedcode/data/plugin/cran-package-expected.json
@@ -44,6 +44,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 50.0,
@@ -54,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -148,6 +150,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 50.0,
@@ -158,6 +161,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
diff --git a/tests/packagedcode/data/plugin/freebsd-package-expected.json b/tests/packagedcode/data/plugin/freebsd-package-expected.json
index f1bcc51e1b2..f6744b98d00 100644
--- a/tests/packagedcode/data/plugin/freebsd-package-expected.json
+++ b/tests/packagedcode/data/plugin/freebsd-package-expected.json
@@ -42,6 +42,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -52,6 +53,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -129,6 +131,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -139,6 +142,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json
index bdbceb111de..8e6dc893bb7 100644
--- a/tests/packagedcode/data/plugin/get_installed_packages-expected.json
+++ b/tests/packagedcode/data/plugin/get_installed_packages-expected.json
@@ -40,6 +40,7 @@
     "license_detections": [
       {
         "license_expression": "x11-fsf",
+        "license_expression_spdx": "X11-distribute-modifications-variant",
         "matches": [
           {
             "score": 100.0,
@@ -50,6 +51,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-fsf",
+            "spdx_license_expression": "X11-distribute-modifications-variant",
             "rule_identifier": "x11-fsf.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -60,6 +62,7 @@
       },
       {
         "license_expression": "x11-xconsortium",
+        "license_expression_spdx": "X11",
         "matches": [
           {
             "score": 100.0,
@@ -70,6 +73,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
             "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -80,6 +84,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -90,6 +95,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_19.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -100,6 +106,7 @@
       },
       {
         "license_expression": "x11-xconsortium",
+        "license_expression_spdx": "X11",
         "matches": [
           {
             "score": 100.0,
@@ -110,6 +117,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
             "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -216,6 +224,7 @@
             "license_detections": [
               {
                 "license_expression": "x11-fsf",
+                "license_expression_spdx": "X11-distribute-modifications-variant",
                 "matches": [
                   {
                     "score": 100.0,
@@ -226,6 +235,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-fsf",
+                    "spdx_license_expression": "X11-distribute-modifications-variant",
                     "rule_identifier": "x11-fsf.LICENSE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
@@ -236,6 +246,7 @@
               },
               {
                 "license_expression": "x11-xconsortium",
+                "license_expression_spdx": "X11",
                 "matches": [
                   {
                     "score": 100.0,
@@ -246,6 +257,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
                     "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
@@ -256,6 +268,7 @@
               },
               {
                 "license_expression": "bsd-new",
+                "license_expression_spdx": "BSD-3-Clause",
                 "matches": [
                   {
                     "score": 100.0,
@@ -266,6 +279,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "bsd-new",
+                    "spdx_license_expression": "BSD-3-Clause",
                     "rule_identifier": "bsd-new_19.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
@@ -276,6 +290,7 @@
               },
               {
                 "license_expression": "x11-xconsortium",
+                "license_expression_spdx": "X11",
                 "matches": [
                   {
                     "score": 100.0,
@@ -286,6 +301,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
                     "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
@@ -454,6 +470,7 @@
     "other_license_detections": [
       {
         "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+        "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
         "matches": [
           {
             "score": 100.0,
@@ -464,6 +481,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -478,6 +496,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -492,6 +511,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
             "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
@@ -580,6 +600,7 @@
             "other_license_detections": [
               {
                 "license_expression": "lgpl-2.1-plus AND lgpl-2.1",
+                "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
                 "matches": [
                   {
                     "score": 100.0,
@@ -590,6 +611,7 @@
                     "match_coverage": 100.0,
                     "matcher": "1-hash",
                     "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
                     "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE",
@@ -604,6 +626,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
                     "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
@@ -618,6 +641,7 @@
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
                     "license_expression": "lgpl-2.1",
+                    "spdx_license_expression": "LGPL-2.1-only",
                     "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_relevance": 100,
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
diff --git a/tests/packagedcode/data/plugin/haxe-package-expected.json b/tests/packagedcode/data/plugin/haxe-package-expected.json
index 9e0b64c8ee0..9feddd07c2e 100644
--- a/tests/packagedcode/data/plugin/haxe-package-expected.json
+++ b/tests/packagedcode/data/plugin/haxe-package-expected.json
@@ -42,6 +42,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -52,6 +53,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -129,6 +131,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -139,6 +142,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json
index 79cc96146ff..7b40de3743a 100644
--- a/tests/packagedcode/data/plugin/maven-package-expected.json
+++ b/tests/packagedcode/data/plugin/maven-package-expected.json
@@ -221,6 +221,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain AND gpl-1.0-plus",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 70.0,
@@ -231,6 +232,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -245,6 +247,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -752,6 +755,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -762,6 +766,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1316.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
@@ -982,6 +987,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -992,6 +998,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_1160.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
@@ -1155,6 +1162,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -1165,6 +1173,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -1179,6 +1188,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
@@ -1371,6 +1381,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
           "matches": [
             {
               "score": 75.0,
@@ -1381,6 +1392,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_relevance": 75,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -1395,6 +1407,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
@@ -1462,6 +1475,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1472,6 +1486,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -1531,6 +1546,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -1541,6 +1557,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -1555,6 +1572,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
@@ -2017,6 +2035,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2027,6 +2046,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -2094,6 +2114,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2104,6 +2125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -2171,6 +2193,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2181,6 +2204,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -6632,6 +6656,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain AND gpl-1.0-plus",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 70.0,
@@ -6642,6 +6667,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -6656,6 +6682,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -7316,6 +7343,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -7326,6 +7354,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
@@ -7887,6 +7916,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -7897,6 +7927,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_1160.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
@@ -8382,6 +8413,7 @@
           "license_detections": [
             {
               "license_expression": "epl-1.0",
+              "license_expression_spdx": "EPL-1.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -8392,6 +8424,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
                   "rule_identifier": "epl-1.0_4.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -8406,6 +8439,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
                   "rule_identifier": "epl-1.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
@@ -8830,6 +8864,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND lgpl-2.1-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
               "matches": [
                 {
                   "score": 75.0,
@@ -8840,6 +8875,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_relevance": 75,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -8854,6 +8890,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl_7.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
@@ -8995,6 +9032,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -9005,6 +9043,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -9158,6 +9197,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -9168,6 +9208,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -9182,6 +9223,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl_3.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
@@ -10451,6 +10493,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -10461,6 +10504,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -11212,6 +11256,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -11222,6 +11267,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -11483,6 +11529,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -11493,6 +11540,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
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 79cc96146ff..7b40de3743a 100644
--- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json
+++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json
@@ -221,6 +221,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain AND gpl-1.0-plus",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
           "matches": [
             {
               "score": 70.0,
@@ -231,6 +232,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -245,6 +247,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -752,6 +755,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -762,6 +766,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1316.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
@@ -982,6 +987,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -992,6 +998,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_1160.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
@@ -1155,6 +1162,7 @@
       "license_detections": [
         {
           "license_expression": "epl-1.0",
+          "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -1165,6 +1173,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -1179,6 +1188,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
               "rule_identifier": "epl-1.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
@@ -1371,6 +1381,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
           "matches": [
             {
               "score": 75.0,
@@ -1381,6 +1392,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_relevance": 75,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -1395,6 +1407,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
@@ -1462,6 +1475,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1472,6 +1486,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -1531,6 +1546,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -1541,6 +1557,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -1555,6 +1572,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
@@ -2017,6 +2035,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2027,6 +2046,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -2094,6 +2114,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2104,6 +2125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -2171,6 +2193,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -2181,6 +2204,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -6632,6 +6656,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain AND gpl-1.0-plus",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 70.0,
@@ -6642,6 +6667,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -6656,6 +6682,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -7316,6 +7343,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -7326,6 +7354,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
@@ -7887,6 +7916,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -7897,6 +7927,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_1160.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
@@ -8382,6 +8413,7 @@
           "license_detections": [
             {
               "license_expression": "epl-1.0",
+              "license_expression_spdx": "EPL-1.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -8392,6 +8424,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
                   "rule_identifier": "epl-1.0_4.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
@@ -8406,6 +8439,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
                   "rule_identifier": "epl-1.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
@@ -8830,6 +8864,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND lgpl-2.1-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
               "matches": [
                 {
                   "score": 75.0,
@@ -8840,6 +8875,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_relevance": 75,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -8854,6 +8890,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
                   "rule_identifier": "lgpl_7.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
@@ -8995,6 +9032,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -9005,6 +9043,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -9158,6 +9197,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -9168,6 +9208,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
@@ -9182,6 +9223,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl_3.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
@@ -10451,6 +10493,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -10461,6 +10504,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -11212,6 +11256,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -11222,6 +11267,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
@@ -11483,6 +11529,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -11493,6 +11540,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
diff --git a/tests/packagedcode/data/plugin/mui-package-expected.json b/tests/packagedcode/data/plugin/mui-package-expected.json
index 0f6aa2ed065..ef193e19a2b 100644
--- a/tests/packagedcode/data/plugin/mui-package-expected.json
+++ b/tests/packagedcode/data/plugin/mui-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
diff --git a/tests/packagedcode/data/plugin/mun-package-expected.json b/tests/packagedcode/data/plugin/mun-package-expected.json
index 2cfa9b5fed7..31450754a64 100644
--- a/tests/packagedcode/data/plugin/mun-package-expected.json
+++ b/tests/packagedcode/data/plugin/mun-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
diff --git a/tests/packagedcode/data/plugin/nuget-package-expected.json b/tests/packagedcode/data/plugin/nuget-package-expected.json
index 3fae5fdc5ca..b6dde160863 100644
--- a/tests/packagedcode/data/plugin/nuget-package-expected.json
+++ b/tests/packagedcode/data/plugin/nuget-package-expected.json
@@ -44,6 +44,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -54,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_20.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_20.RULE",
@@ -304,6 +306,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -314,6 +317,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_20.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_20.RULE",
diff --git a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
index 8bf22baccb1..88109ed6f35 100644
--- a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
+++ b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
@@ -44,6 +44,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -54,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -176,6 +178,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -186,6 +189,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/python-package-expected.json b/tests/packagedcode/data/plugin/python-package-expected.json
index 8097fc81433..f54a9fdc124 100644
--- a/tests/packagedcode/data/plugin/python-package-expected.json
+++ b/tests/packagedcode/data/plugin/python-package-expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-simplified",
+          "license_expression_spdx": "BSD-2-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-simplified",
+              "spdx_license_expression": "BSD-2-Clause",
               "rule_identifier": "bsd-simplified_150.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
@@ -120,6 +122,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -130,6 +133,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -140,6 +144,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -150,6 +155,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -207,6 +213,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -217,6 +224,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -288,6 +296,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -298,6 +307,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -308,6 +318,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -318,6 +329,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -383,6 +395,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -393,6 +406,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -806,6 +820,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -816,6 +831,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -826,6 +842,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -836,6 +853,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -899,6 +917,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -909,6 +928,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -987,6 +1007,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -997,6 +1018,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -1075,6 +1097,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-simplified",
+              "license_expression_spdx": "BSD-2-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -1085,6 +1108,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-simplified",
+                  "spdx_license_expression": "BSD-2-Clause",
                   "rule_identifier": "bsd-simplified_150.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
@@ -1392,6 +1416,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1402,6 +1427,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1412,6 +1438,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1422,6 +1449,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
diff --git a/tests/packagedcode/data/plugin/rpm-package-expected.json b/tests/packagedcode/data/plugin/rpm-package-expected.json
index 73a43bb87b8..dd53afbb191 100644
--- a/tests/packagedcode/data/plugin/rpm-package-expected.json
+++ b/tests/packagedcode/data/plugin/rpm-package-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
               "score": 50.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -105,6 +107,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-1.0-plus",
+              "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
                   "score": 50.0,
@@ -115,6 +118,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
                   "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
diff --git a/tests/packagedcode/data/plugin/rubygems-package-expected.json b/tests/packagedcode/data/plugin/rubygems-package-expected.json
index 7eb242f462e..1254c8adf9e 100644
--- a/tests/packagedcode/data/plugin/rubygems-package-expected.json
+++ b/tests/packagedcode/data/plugin/rubygems-package-expected.json
@@ -58,6 +58,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -68,6 +69,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -344,6 +346,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -354,6 +357,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/plugin/sys-package-expected.json b/tests/packagedcode/data/plugin/sys-package-expected.json
index 1a59b49e085..fed46ade66f 100644
--- a/tests/packagedcode/data/plugin/sys-package-expected.json
+++ b/tests/packagedcode/data/plugin/sys-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
diff --git a/tests/packagedcode/data/plugin/tlb-package-expected.json b/tests/packagedcode/data/plugin/tlb-package-expected.json
index 49e8281696e..317e7f26d37 100644
--- a/tests/packagedcode/data/plugin/tlb-package-expected.json
+++ b/tests/packagedcode/data/plugin/tlb-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
diff --git a/tests/packagedcode/data/plugin/win_pe-package-expected.json b/tests/packagedcode/data/plugin/win_pe-package-expected.json
index 92edc14fac6..639fb0552cb 100644
--- a/tests/packagedcode/data/plugin/win_pe-package-expected.json
+++ b/tests/packagedcode/data/plugin/win_pe-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-simplified-darwin",
+              "license_expression_spdx": "LicenseRef-scancode-bsd-simplified-darwin",
               "matches": [
                 {
                   "score": 100.0,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-simplified-darwin",
+                  "spdx_license_expression": "LicenseRef-scancode-bsd-simplified-darwin",
                   "rule_identifier": "bsd-simplified-darwin.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE",
diff --git a/tests/packagedcode/data/plugin/winmd-package-expected.json b/tests/packagedcode/data/plugin/winmd-package-expected.json
index 6b5ff8a5c1b..3f69a9f947e 100644
--- a/tests/packagedcode/data/plugin/winmd-package-expected.json
+++ b/tests/packagedcode/data/plugin/winmd-package-expected.json
@@ -43,6 +43,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 88.89,
@@ -53,6 +54,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 998ac6ad772..47facbddb33 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
@@ -44,6 +44,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -54,6 +55,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -64,6 +66,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -74,6 +77,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 4318b449f44..2a870122af4 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 9b29f7f7b55..8b905296cc0 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
@@ -56,6 +56,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft",
+        "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
         "matches": [
           {
             "score": 100.0,
@@ -66,6 +67,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "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",
             "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
             "rule_relevance": 100,
             "rule_url": null,
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 0c4d1027a3e..efeffee60d6 100644
--- a/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json
+++ b/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -62,6 +64,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -72,6 +75,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
diff --git a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json
index 76e560d3bae..561f63b19bf 100644
--- a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 9aa72228955..a47e1e1729d 100644
--- a/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-623aa537047267a404620d70ae00f1448b424248",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-623aa537047267a404620d70ae00f1448b424248",
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 76e560d3bae..561f63b19bf 100644
--- a/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 23533c500c0..256a90d3c61 100644
--- a/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "python",
+        "license_expression_spdx": "Python-2.0",
         "matches": [
           {
             "score": 90.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "python",
+            "spdx_license_expression": "Python-2.0",
             "rule_identifier": "python_26.RULE",
             "rule_relevance": 90,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_26.RULE",
@@ -77,6 +79,7 @@
       },
       {
         "license_expression": "python",
+        "license_expression_spdx": "Python-2.0",
         "matches": [
           {
             "score": 99.0,
@@ -87,6 +90,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "python",
+            "spdx_license_expression": "Python-2.0",
             "rule_identifier": "pypi_python_software_foundation_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_python_software_foundation_license.RULE",
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 224f1c79e20..018e7c970f6 100644
--- a/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_48.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -77,6 +79,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -87,6 +90,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 cc015804add..472036703ec 100644
--- a/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json
+++ b/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 64889288782..2991fbd6ae3 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
@@ -60,6 +60,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -70,6 +71,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -80,6 +82,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -90,6 +93,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 c08cc1a19c3..d7e4255acfb 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 b2d012e7358..25a3eb6b46c 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
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 83350a1069e..4bb938fb50a 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -65,6 +67,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -75,6 +78,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 9e4627ecdf6..5110ec96494 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 7f0a8bd3fd8..e3f56527974 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 517a6026ef2..fe9c1cc45bb 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-simplified",
+        "license_expression_spdx": "BSD-2-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-simplified",
+            "spdx_license_expression": "BSD-2-Clause",
             "rule_identifier": "bsd-simplified_150.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
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 517a6026ef2..fe9c1cc45bb 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-simplified",
+        "license_expression_spdx": "BSD-2-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-simplified",
+            "spdx_license_expression": "BSD-2-Clause",
             "rule_identifier": "bsd-simplified_150.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
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 c107360a2d7..94693b4209e 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
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 728873c6349..3fb1bd298df 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "mpl-2.0",
+        "license_expression_spdx": "MPL-2.0",
         "matches": [
           {
             "score": 50.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mpl-2.0",
+            "spdx_license_expression": "MPL-2.0",
             "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "mpl-2.0",
+        "license_expression_spdx": "MPL-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mpl-2.0",
+            "spdx_license_expression": "MPL-2.0",
             "rule_identifier": "pypi_mozilla_public_license_2_0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mozilla_public_license_2_0.RULE",
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 8afd451d77f..5ce51b66077 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
@@ -49,6 +49,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -59,6 +60,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -69,6 +71,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -79,6 +82,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 915b52f0bd0..641157f93c3 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
@@ -61,6 +61,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.0-plus",
+        "license_expression_spdx": "LGPL-2.0-or-later",
         "matches": [
           {
             "score": 75.0,
@@ -71,6 +72,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.0-plus",
+            "spdx_license_expression": "LGPL-2.0-or-later",
             "rule_identifier": "lgpl_bare_single_word.RULE",
             "rule_relevance": 75,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
@@ -81,6 +83,7 @@
       },
       {
         "license_expression": "lgpl-2.0-plus",
+        "license_expression_spdx": "LGPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -91,6 +94,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.0-plus",
+            "spdx_license_expression": "LGPL-2.0-or-later",
             "rule_identifier": "pypi_gnu_library_or_lesser_general_public_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_library_or_lesser_general_public_license.RULE",
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 12bfff2f7b9..777b1573984 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
@@ -86,6 +86,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain AND python AND bsd-simplified AND gpl-3.0",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain AND Python-2.0 AND BSD-2-Clause AND GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -96,6 +97,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "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",
             "rule_identifier": "public-domain_and_python_and_bsd-simplified_and_gpl-3.0_2.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_and_python_and_bsd-simplified_and_gpl-3.0_2.RULE",
@@ -106,6 +108,7 @@
       },
       {
         "license_expression": "public-domain AND python AND bsd-new AND gpl-1.0-plus",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain AND Python-2.0 AND BSD-3-Clause AND GPL-1.0-or-later",
         "matches": [
           {
             "score": 99.0,
@@ -116,6 +119,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "pypi_public_domain.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
@@ -130,6 +134,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "python",
+            "spdx_license_expression": "Python-2.0",
             "rule_identifier": "pypi_python_software_foundation_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_python_software_foundation_license.RULE",
@@ -144,6 +149,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -158,6 +164,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "pypi_gnu_general_public_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_general_public_license.RULE",
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 399250756fe..d5c13982d94 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
@@ -55,6 +55,7 @@
     "license_detections": [
       {
         "license_expression": "other-permissive",
+        "license_expression_spdx": "LicenseRef-scancode-other-permissive",
         "matches": [
           {
             "score": 100.0,
@@ -65,6 +66,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "other-permissive",
+            "spdx_license_expression": "LicenseRef-scancode-other-permissive",
             "rule_identifier": "other-permissive_16.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_16.RULE",
@@ -75,6 +77,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -85,6 +88,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 5d4cf982d2c..8840292a1fa 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
@@ -53,6 +53,7 @@
     "license_detections": [
       {
         "license_expression": "epl-1.0 AND bsd-new",
+        "license_expression_spdx": "EPL-1.0 AND BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -63,6 +64,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "epl-1.0",
+            "spdx_license_expression": "EPL-1.0",
             "rule_identifier": "epl-1.0_18.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_18.RULE",
@@ -77,6 +79,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_802.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_802.RULE",
@@ -87,6 +90,7 @@
       },
       {
         "license_expression": "free-unknown",
+        "license_expression_spdx": "LicenseRef-scancode-free-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -97,6 +101,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "free-unknown",
+            "spdx_license_expression": "LicenseRef-scancode-free-unknown",
             "rule_identifier": "pypi_osi_approved.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_osi_approved.RULE",
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 1e267ec18f4..c5470db8834 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
@@ -56,6 +56,7 @@
     "license_detections": [
       {
         "license_expression": "isc",
+        "license_expression_spdx": "ISC",
         "matches": [
           {
             "score": 99.0,
@@ -66,6 +67,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "isc",
+            "spdx_license_expression": "ISC",
             "rule_identifier": "isc_22.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_22.RULE",
@@ -76,6 +78,7 @@
       },
       {
         "license_expression": "isc",
+        "license_expression_spdx": "ISC",
         "matches": [
           {
             "score": 100.0,
@@ -86,6 +89,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "isc",
+            "spdx_license_expression": "ISC",
             "rule_identifier": "pypi_isc_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_isc_license.RULE",
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 174c41f0c0f..88a8b82fe06 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
@@ -49,6 +49,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -59,6 +60,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -69,6 +71,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -79,6 +82,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 f21aa6767b7..5ba03935763 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
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -71,6 +73,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -81,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 feac6f20098..55e6c7dec03 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
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -77,6 +79,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -87,6 +90,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 05a28585273..bd3c0dd1d0e 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
@@ -44,6 +44,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -54,6 +55,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -64,6 +66,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -74,6 +77,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 24949605465..60aa83cec76 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
@@ -42,6 +42,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -52,6 +53,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 df372e279cf..403c8a12f06 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 50.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl_bare_word_only.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
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 c11e07d0176..81ffafaf40f 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
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 a86d620f281..01055d7cc05 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
@@ -61,6 +61,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -71,6 +72,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -81,6 +83,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -91,6 +94,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 1d1184e91f6..c200b52b1f7 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
@@ -46,6 +46,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -56,6 +57,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-3.0",
+            "spdx_license_expression": "LGPL-3.0-only",
             "rule_identifier": "lgpl-3.0_29.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
@@ -66,6 +68,7 @@
       },
       {
         "license_expression": "lgpl-3.0",
+        "license_expression_spdx": "LGPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -76,6 +79,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-3.0",
+            "spdx_license_expression": "LGPL-3.0-only",
             "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
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 6110c67f817..0aa7acab9df 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
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 90.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_708.RULE",
             "rule_relevance": 90,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_708.RULE",
@@ -71,6 +73,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -81,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 41b600b674a..7d1d8b6b1ac 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 6c904a5e922..539ee87c7b6 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
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_323.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_323.RULE",
@@ -70,6 +72,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -80,6 +83,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 f618a11fc2c..de169deb7b2 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 75.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_3.RULE",
             "rule_relevance": 75,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_3.RULE",
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 4db38d22aff..834983e5e22 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 75.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_3.RULE",
             "rule_relevance": 75,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_3.RULE",
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 49bc753490e..b95b50219d5 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
@@ -47,6 +47,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -57,6 +58,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -67,6 +69,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -77,6 +80,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 9a255237f3a..729b4ba0f52 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
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 0c3af83c018..3388da99553 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
@@ -47,6 +47,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -57,6 +58,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -67,6 +69,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -77,6 +80,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 d281c26fb27..2a28d8e95ab 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
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -77,6 +79,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -87,6 +90,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 bedd36f41ac..d8bd431648d 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "gpl-3.0_32.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_32.RULE",
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "gpl-3.0",
+        "license_expression_spdx": "GPL-3.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "free-unknown",
+            "spdx_license_expression": "LicenseRef-scancode-free-unknown",
             "rule_identifier": "pypi_osi_approved.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_osi_approved.RULE",
@@ -92,6 +96,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-3.0",
+            "spdx_license_expression": "GPL-3.0-only",
             "rule_identifier": "gpl-3.0_90.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_90.RULE",
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 ddf77d8c525..eb4dada2dcc 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
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -71,6 +73,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -81,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 26b991979fa..3a995151dd3 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
@@ -46,6 +46,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -56,6 +57,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -66,6 +68,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -76,6 +79,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 a043a6a6208..5e033ab1ab8 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
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 6bb2d589f9c..b707773de3e 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 10272a4ef44..81173f7e27d 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 18574e14d94..863873d1cef 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
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -61,6 +63,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -71,6 +74,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 1a82a26fe59..a31337c6432 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
@@ -46,6 +46,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -56,6 +57,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -66,6 +68,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -76,6 +79,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 64f4bafff88..127deb25523 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
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -71,6 +73,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -81,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
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 e72784bd5f9..a1921a17655 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
@@ -40,6 +40,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -50,6 +51,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 8d81d80062c..cb5336b2a9e 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
@@ -47,6 +47,7 @@
     "license_detections": [
       {
         "license_expression": "(apache-2.0 AND scancode-acknowledgment) AND cc0-1.0",
+        "license_expression_spdx": "(Apache-2.0 AND LicenseRef-scancode-scancode-acknowledgment) AND CC0-1.0",
         "matches": [
           {
             "score": 100.0,
@@ -57,6 +58,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "apache-2.0 AND scancode-acknowledgment",
+            "spdx_license_expression": "Apache-2.0 AND LicenseRef-scancode-scancode-acknowledgment",
             "rule_identifier": "apache-2.0_and_scancode-acknowledgment_5.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_scancode-acknowledgment_5.RULE",
@@ -71,6 +73,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "cc0-1.0",
+            "spdx_license_expression": "CC0-1.0",
             "rule_identifier": "spdx_license_id_cc0-1.0_for_cc0-1.0.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_cc0-1.0_for_cc0-1.0.RULE",
@@ -81,6 +84,7 @@
       },
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 95.0,
@@ -91,6 +95,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "pypi_apache_no-version.RULE",
             "rule_relevance": 95,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
@@ -101,6 +106,7 @@
       },
       {
         "license_expression": "free-unknown",
+        "license_expression_spdx": "LicenseRef-scancode-free-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -111,6 +117,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "free-unknown",
+            "spdx_license_expression": "LicenseRef-scancode-free-unknown",
             "rule_identifier": "pypi_osi_approved.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_osi_approved.RULE",
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 1cbd1d8d648..96c5f576032 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
@@ -41,6 +41,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -51,6 +52,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -61,6 +63,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -71,6 +74,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 7e800dcb1e9..279a8c1a076 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
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -77,6 +79,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -87,6 +90,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 1837f32201b..3fa19164ba8 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
@@ -56,6 +56,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -66,6 +67,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -76,6 +78,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -86,6 +89,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 8324462aea3..9b6bd691e6b 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
@@ -52,6 +52,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -62,6 +63,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 cf4f6e91175..47634958855 100644
--- a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json
+++ b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json
@@ -40,6 +40,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -50,6 +51,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -127,6 +129,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -137,6 +140,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -147,6 +151,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -157,6 +162,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -267,6 +273,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -277,6 +284,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -413,6 +421,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 100.0,
@@ -423,6 +432,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
@@ -433,6 +443,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -443,6 +454,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -1002,6 +1014,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1012,6 +1025,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json
index 0260c651610..4f2d3dd077e 100644
--- a/tests/packagedcode/data/pypi/solo-metadata/expected.json
+++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json
@@ -64,6 +64,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft",
+          "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
           "matches": [
             {
               "score": 100.0,
@@ -74,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "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",
               "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
               "rule_relevance": 100,
               "rule_url": null,
@@ -173,6 +175,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft",
+              "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
               "matches": [
                 {
                   "score": 100.0,
@@ -183,6 +186,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "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",
                   "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/packagedcode/data/pypi/solo-setup/expected.json b/tests/packagedcode/data/pypi/solo-setup/expected.json
index f02aedca79a..43f114edeec 100644
--- a/tests/packagedcode/data/pypi/solo-setup/expected.json
+++ b/tests/packagedcode/data/pypi/solo-setup/expected.json
@@ -50,6 +50,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -60,6 +61,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -70,6 +72,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -80,6 +83,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 264b47117c8..2926c6b8eb7 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
@@ -50,6 +50,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -60,6 +61,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -70,6 +72,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -80,6 +83,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -204,6 +208,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -214,6 +219,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -224,6 +230,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -234,6 +241,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -662,6 +670,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -672,6 +681,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -682,6 +692,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -692,6 +703,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -801,6 +813,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -811,6 +824,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -821,6 +835,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -831,6 +846,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 15786349a8c..3c2940c532b 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
@@ -56,6 +56,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -66,6 +67,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -76,6 +78,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -86,6 +89,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 23b872569fe..a4fac4fedbd 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
@@ -50,6 +50,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -60,6 +61,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -70,6 +72,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -80,6 +83,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -117,6 +121,7 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 5,
       "sample_matches": [
         {
@@ -128,6 +133,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -138,6 +144,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -149,6 +156,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -159,6 +167,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -170,6 +179,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -180,6 +190,7 @@
     {
       "identifier": "mit-59433771-4926-870e-d21a-8162cfa060a3",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -191,6 +202,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
@@ -205,6 +217,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -215,6 +228,7 @@
     {
       "identifier": "mit-707ccf7a-5c60-0e4c-5844-349c989a00f5",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -226,6 +240,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
@@ -240,6 +255,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -254,6 +270,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -264,6 +281,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -275,6 +293,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -285,6 +304,7 @@
     {
       "identifier": "mit-6e6256c5-00ca-dcb6-8033-2fc4b6ff86be",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -296,6 +316,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -310,6 +331,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -345,6 +367,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -355,6 +378,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -449,6 +473,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -459,6 +484,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -469,6 +495,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -479,6 +506,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -515,6 +543,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -525,6 +554,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -534,6 +564,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -544,6 +575,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -553,6 +585,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -563,6 +596,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -576,6 +610,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -876,6 +911,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -886,6 +922,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -953,6 +990,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -963,6 +1001,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -976,6 +1015,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -989,6 +1029,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1024,6 +1065,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1034,6 +1076,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -1047,6 +1090,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1060,6 +1104,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1129,6 +1174,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1139,6 +1185,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1149,6 +1196,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1159,6 +1207,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -1196,6 +1245,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1206,6 +1256,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -1219,6 +1270,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -1321,6 +1373,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1331,6 +1384,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1341,6 +1395,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1351,6 +1406,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -1541,6 +1597,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1551,6 +1608,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -1560,6 +1618,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1570,6 +1629,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -1579,6 +1639,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1589,6 +1650,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -1602,6 +1664,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
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 02d34587a11..cc9e03fcfa0 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
@@ -39,6 +39,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -49,6 +50,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 0f6a491972c..0d8bd9b23c6 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
@@ -39,6 +39,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -49,6 +50,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 76e560d3bae..561f63b19bf 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 e74d75ecca8..4cd5333bc90 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -68,6 +70,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -78,6 +81,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 48724624980..4cd645dd9f8 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
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 e789b8eb58d..3a7b451412f 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 fc6b86bb396..1dddaae592b 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
@@ -53,6 +53,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -63,6 +64,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -73,6 +75,7 @@
         },
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -83,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -771,6 +775,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -781,6 +786,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -791,6 +797,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -801,6 +808,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
@@ -899,6 +907,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -909,6 +918,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -919,6 +929,7 @@
             },
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -929,6 +940,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 554cb13d3f0..a766e51b365 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
@@ -41,6 +41,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +52,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -61,6 +63,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -71,6 +74,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -236,6 +240,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -246,6 +251,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -256,6 +262,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -266,6 +273,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 ac728b66491..2c69e8af149 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
@@ -53,6 +53,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -63,6 +64,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -73,6 +75,7 @@
       },
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -83,6 +86,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "pypi_bsd_license.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
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 9fd32d8d201..a31f137dfc7 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 3d23f4fe1bf..2c1689bb6a6 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
@@ -53,6 +53,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -63,6 +64,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -73,6 +75,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -83,6 +86,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 651e1e90755..0356bfc6b91 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
@@ -54,6 +54,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -64,6 +65,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -74,6 +76,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -84,6 +87,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 db080ef08c3..0bc207693b8 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
@@ -45,6 +45,7 @@
     "license_detections": [
       {
         "license_expression": "agpl-3.0-plus",
+        "license_expression_spdx": "AGPL-3.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -55,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "agpl-3.0-plus",
+            "spdx_license_expression": "AGPL-3.0-or-later",
             "rule_identifier": "spdx_license_id_agpl-3.0-or-later_for_agpl-3.0-plus.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_agpl-3.0-or-later_for_agpl-3.0-plus.RULE",
@@ -65,6 +67,7 @@
       },
       {
         "license_expression": "agpl-3.0-plus",
+        "license_expression_spdx": "AGPL-3.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -75,6 +78,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "agpl-3.0-plus",
+            "spdx_license_expression": "AGPL-3.0-or-later",
             "rule_identifier": "pypi_gnu_affero_general_public_license_v3_or_later.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_affero_general_public_license_v3_or_later.RULE",
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 7e72476fbb0..9c6449fd073 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
@@ -51,6 +51,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -61,6 +62,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -71,6 +73,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -81,6 +84,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
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 cd9ae6b1bce..9220c89132c 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
@@ -48,6 +48,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -58,6 +59,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 f17b60346c3..238070f2ae3 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
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "mit_14.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
@@ -63,6 +65,7 @@
       },
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -73,6 +76,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "pypi_mit_license.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
diff --git a/tests/packagedcode/data/readme/android/basic/README.android.expected b/tests/packagedcode/data/readme/android/basic/README.android.expected
index 343ea50d21f..73be0a3ee6a 100644
--- a/tests/packagedcode/data/readme/android/basic/README.android.expected
+++ b/tests/packagedcode/data/readme/android/basic/README.android.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
diff --git a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected
index ee6eb163282..6f59af3b174 100644
--- a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected
+++ b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 90.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "apache-2.0_161.RULE",
             "rule_relevance": 90,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_161.RULE",
diff --git a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected
index 3ae9852bd21..4fbe5846368 100644
--- a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected
+++ b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
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 3ae9852bd21..4fbe5846368 100644
--- a/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected
+++ b/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
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 bc31a71642e..ac01accf45c 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 bc31a71642e..ac01accf45c 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 626cc15a99d..47f3ab7e50f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 626cc15a99d..47f3ab7e50f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 626cc15a99d..47f3ab7e50f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
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 3ae9852bd21..4fbe5846368 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-4e63c2896b2b2bc5235eb55ed408f87187ffe1b3",
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 626cc15a99d..47f3ab7e50f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "apache-2.0",
+            "spdx_license_expression": "Apache-2.0",
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
diff --git a/tests/packagedcode/data/readme/google/basic/README.google.expected b/tests/packagedcode/data/readme/google/basic/README.google.expected
index 1c9f5c75614..cc247358616 100644
--- a/tests/packagedcode/data/readme/google/basic/README.google.expected
+++ b/tests/packagedcode/data/readme/google/basic/README.google.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
diff --git a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected
index d8c7b71ab24..c0ea50414e8 100644
--- a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected
+++ b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 99.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_89.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
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 9553422794b..43dd69d496e 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.0-plus",
+        "license_expression_spdx": "LGPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.0-plus",
+            "spdx_license_expression": "LGPL-2.0-or-later",
             "rule_identifier": "lgpl-2.0-plus_68.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
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 15b96261fac..5861a44ea96 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
@@ -132,6 +134,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0",
+        "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
             "score": 100.0,
@@ -142,6 +145,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
             "rule_identifier": "gpl-2.0_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -225,6 +229,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-2.0-plus",
+        "license_expression_spdx": "GPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -235,6 +240,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-2.0-plus",
+            "spdx_license_expression": "GPL-2.0-or-later",
             "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
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 50c15ac9e96..4fb57a20a29 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND lgpl-2.0-plus",
+        "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-3.0-plus",
+            "spdx_license_expression": "GPL-3.0-or-later",
             "rule_identifier": "gpl-3.0-plus_28.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -54,6 +56,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-3.0-plus",
+            "spdx_license_expression": "GPL-3.0-or-later",
             "rule_identifier": "gpl-3.0-plus_28.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -68,6 +71,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-2.0-plus",
+            "spdx_license_expression": "GPL-2.0-or-later",
             "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -82,6 +86,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.0-plus",
+            "spdx_license_expression": "LGPL-2.0-or-later",
             "rule_identifier": "lgpl-2.0-plus_68.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -237,6 +242,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -247,6 +253,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 d7c26def90f..dc2e2dec8e7 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 50.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl_bare_word_only.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
@@ -960,6 +962,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -970,6 +973,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 1930911cda4..d2a3a055a18 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "boost-1.0",
+        "license_expression_spdx": "BSL-1.0",
         "matches": [
           {
             "score": 50.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "boost-1.0",
+            "spdx_license_expression": "BSL-1.0",
             "rule_identifier": "boost-1.0_48.RULE",
             "rule_relevance": 50,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_48.RULE",
@@ -114,6 +116,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.1",
+        "license_expression_spdx": "LGPL-2.1-only",
         "matches": [
           {
             "score": 100.0,
@@ -124,6 +127,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
             "rule_identifier": "lgpl-2.1_85.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_85.RULE",
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 c6d52e1e7b5..b320e5c613a 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -429,6 +431,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -439,6 +442,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -494,6 +498,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -504,6 +509,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 bb35fec90cf..fa27a7a2c65 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
@@ -31,6 +31,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -41,6 +42,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -301,6 +303,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -311,6 +314,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -409,6 +413,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -419,6 +424,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -478,6 +484,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -488,6 +495,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -17200,6 +17208,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -17210,6 +17219,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -17224,6 +17234,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -17238,6 +17249,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -17297,6 +17309,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -17307,6 +17320,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -17321,6 +17335,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -17335,6 +17350,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -17811,6 +17827,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -17821,6 +17838,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -18828,6 +18846,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -18838,6 +18857,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -18945,6 +18965,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -18955,6 +18976,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_24.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_24.RULE",
@@ -19053,6 +19075,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -19063,6 +19086,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -19122,6 +19146,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -19132,6 +19157,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -19419,6 +19445,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -19429,6 +19456,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -19500,6 +19528,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -19510,6 +19539,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -19635,6 +19665,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -19645,6 +19676,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -19716,6 +19748,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -19726,6 +19759,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -20103,6 +20137,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -20113,6 +20148,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -20127,6 +20163,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -20225,6 +20262,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -20235,6 +20273,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -21089,6 +21128,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -21099,6 +21139,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -21113,6 +21154,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -21220,6 +21262,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -21230,6 +21273,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -21244,6 +21288,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -21378,6 +21423,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -21388,6 +21434,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -21468,6 +21515,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -21478,6 +21526,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -21972,6 +22021,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -21982,6 +22032,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -22071,6 +22122,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -22081,6 +22133,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -22152,6 +22205,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -22162,6 +22216,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -22305,6 +22360,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-3.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -22315,6 +22371,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -22329,6 +22386,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -22463,6 +22521,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -22473,6 +22532,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -22553,6 +22613,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -22563,6 +22624,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -22652,6 +22714,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -22662,6 +22725,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -22760,6 +22824,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -22770,6 +22835,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -22829,6 +22895,7 @@
       "license_detections": [
         {
           "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "matches": [
             {
               "score": 100.0,
@@ -22839,6 +22906,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
               "rule_identifier": "spdx-license-identifier-openssl-ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
               "rule_relevance": 100,
               "rule_url": null,
@@ -22937,6 +23005,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -22947,6 +23016,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -23036,6 +23106,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -23046,6 +23117,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -23060,6 +23132,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -23131,6 +23204,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -23141,6 +23215,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -23212,6 +23287,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -23222,6 +23298,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -23716,6 +23793,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -23726,6 +23804,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -24283,6 +24362,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus AND gpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -24293,6 +24373,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -24307,6 +24388,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -24441,6 +24523,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -24451,6 +24534,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -24465,6 +24549,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -24716,6 +24801,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus AND gpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -24726,6 +24812,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -24740,6 +24827,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -24754,6 +24842,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -24888,6 +24977,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -24898,6 +24988,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -25014,6 +25105,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -25024,6 +25116,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -25149,6 +25242,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -25159,6 +25253,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -25446,6 +25541,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -25456,6 +25552,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -25527,6 +25624,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -25537,6 +25635,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -25644,6 +25743,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -25654,6 +25754,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -28596,6 +28697,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -28606,6 +28708,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -28713,6 +28816,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -28723,6 +28827,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -28737,6 +28842,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -28817,6 +28923,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -28827,6 +28934,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -28943,6 +29051,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -28953,6 +29062,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -29159,6 +29269,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -29169,6 +29280,7 @@
               "match_coverage": 100.0,
               "matcher": "5-undetected",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
@@ -29321,6 +29433,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -29331,6 +29444,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -29402,6 +29516,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -29412,6 +29527,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -29483,6 +29599,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -29493,6 +29610,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -30338,6 +30456,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -30348,6 +30467,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -30362,6 +30482,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -30376,6 +30497,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -30390,6 +30512,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -30461,6 +30584,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -30471,6 +30595,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -30614,6 +30739,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -30624,6 +30750,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -30722,6 +30849,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -30732,6 +30860,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -30882,6 +31011,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -30892,6 +31022,7 @@
               "match_coverage": 100.0,
               "matcher": "5-undetected",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
@@ -30951,6 +31082,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -30961,6 +31093,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -30975,6 +31108,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -30989,6 +31123,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -31003,6 +31138,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -31083,6 +31219,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -31093,6 +31230,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -31254,6 +31392,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -31264,6 +31403,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -185100,6 +185240,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -185110,6 +185251,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -185169,6 +185311,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -185179,6 +185322,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -185259,6 +185403,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -185269,6 +185414,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -185283,6 +185429,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -185297,6 +185444,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -185404,6 +185552,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -185414,6 +185563,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -185656,6 +185806,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -185666,6 +185817,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -185725,6 +185877,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -185735,6 +185888,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -185806,6 +185960,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -185816,6 +185971,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -185923,6 +186079,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -185933,6 +186090,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -185992,6 +186150,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -186002,6 +186161,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -186082,6 +186242,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -186092,6 +186253,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
               "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
@@ -186181,6 +186343,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -186191,6 +186354,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -186205,6 +186369,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -186219,6 +186384,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -186317,6 +186483,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -186327,6 +186494,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -186398,6 +186566,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -186408,6 +186577,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -186497,6 +186667,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -186507,6 +186678,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -186659,6 +186831,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -186669,6 +186842,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -187235,6 +187409,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus AND gpl-3.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -187245,6 +187420,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -187259,6 +187435,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -187273,6 +187450,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -187398,6 +187576,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -187408,6 +187587,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -187479,6 +187659,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -187489,6 +187670,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -187560,6 +187742,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -187570,6 +187753,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -187722,6 +187906,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -187732,6 +187917,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -187803,6 +187989,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -187813,6 +188000,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -188901,6 +189089,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -188911,6 +189100,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -189018,6 +189208,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -189028,6 +189219,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -189171,6 +189363,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -189181,6 +189374,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -189288,6 +189482,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -189298,6 +189493,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -189387,6 +189583,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -189397,6 +189594,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -189411,6 +189609,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -189527,6 +189726,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -189537,6 +189737,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -189671,6 +189872,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -189681,6 +189883,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -189788,6 +189991,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -189798,6 +190002,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -189878,6 +190083,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -189888,6 +190094,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -190634,6 +190841,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -190644,6 +190852,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -190877,6 +191086,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -190887,6 +191097,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -193568,6 +193779,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -193578,6 +193790,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -193649,6 +193862,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -193659,6 +193873,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -193673,6 +193888,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -193807,6 +194023,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -193817,6 +194034,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
               "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
@@ -194014,6 +194232,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -194024,6 +194243,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -194083,6 +194303,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -194093,6 +194314,7 @@
               "match_coverage": 100.0,
               "matcher": "5-undetected",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
@@ -194152,6 +194374,7 @@
       "license_detections": [
         {
           "license_expression": "mpl-2.0",
+          "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -194162,6 +194385,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
               "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -194242,6 +194466,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -194252,6 +194477,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -194323,6 +194549,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -194333,6 +194560,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
               "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -194404,6 +194632,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -194414,6 +194643,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -194485,6 +194715,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -194495,6 +194726,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -194584,6 +194816,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -194594,6 +194827,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -194710,6 +194944,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -194720,6 +194955,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -194836,6 +195072,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -194846,6 +195083,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -194860,6 +195098,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -194874,6 +195113,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -195287,6 +195527,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -195297,6 +195538,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -195575,6 +195817,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -195585,6 +195828,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -195656,6 +195900,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -195666,6 +195911,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -195827,6 +196073,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -195837,6 +196084,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -195851,6 +196099,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -195958,6 +196207,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
               "score": 99.0,
@@ -195968,6 +196218,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
               "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -196048,6 +196299,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -196058,6 +196310,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -197056,6 +197309,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -197066,6 +197320,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -197146,6 +197401,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -197156,6 +197412,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -197236,6 +197493,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 AND gpl-2.0-plus AND lgpl-2.0-plus AND public-domain",
+          "license_expression_spdx": "GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 100.0,
@@ -197246,6 +197504,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -197260,6 +197519,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -197274,6 +197534,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
               "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -197288,6 +197549,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -216810,6 +217072,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -216820,6 +217083,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -217173,6 +217437,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -217183,6 +217448,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -217527,6 +217793,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -217537,6 +217804,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -217592,6 +217860,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -217602,6 +217871,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -234326,6 +234596,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -234336,6 +234607,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -234350,6 +234622,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -234364,6 +234637,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -234419,6 +234693,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -234429,6 +234704,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -234443,6 +234719,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -234457,6 +234734,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -237393,6 +237671,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -237403,6 +237682,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -238602,6 +238882,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -238612,6 +238893,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -238758,6 +239040,7 @@
           "license_detections": [
             {
               "license_expression": "zlib",
+              "license_expression_spdx": "Zlib",
               "matches": [
                 {
                   "score": 100.0,
@@ -238768,6 +239051,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
                   "rule_identifier": "zlib_24.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_24.RULE",
@@ -238887,6 +239171,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -238897,6 +239182,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -238998,6 +239284,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -239008,6 +239295,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -239334,6 +239622,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -239344,6 +239633,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -239436,6 +239726,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -239446,6 +239737,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -239637,6 +239929,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -239647,6 +239940,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -239748,6 +240042,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -239758,6 +240053,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -240165,6 +240461,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -240175,6 +240472,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -240189,6 +240487,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -240335,6 +240634,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -240345,6 +240645,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -241328,6 +241629,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -241338,6 +241640,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -241352,6 +241655,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -241489,6 +241793,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -241499,6 +241804,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -241513,6 +241819,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -241677,6 +241984,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -241687,6 +241995,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -241761,6 +242070,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -241771,6 +242081,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -242286,6 +242597,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -242296,6 +242608,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -242388,6 +242701,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -242398,6 +242712,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -242499,6 +242814,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -242509,6 +242825,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -242691,6 +243008,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-3.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -242701,6 +243019,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -242715,6 +243034,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -242879,6 +243199,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -242889,6 +243210,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -242981,6 +243303,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -242991,6 +243314,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -243083,6 +243407,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -243093,6 +243418,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -243221,6 +243547,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -243231,6 +243558,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -243332,6 +243660,7 @@
           "license_detections": [
             {
               "license_expression": "openssl-ssleay",
+              "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
                   "score": 100.0,
@@ -243342,6 +243671,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
                   "rule_identifier": "spdx-license-identifier-openssl-ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -243569,6 +243899,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -243579,6 +243910,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -243689,6 +244021,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -243699,6 +244032,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -243713,6 +244047,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -243967,6 +244302,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -243977,6 +244313,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -244078,6 +244415,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -244088,6 +244426,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -244666,6 +245005,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -244676,6 +245016,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -245299,6 +245640,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus AND gpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -245309,6 +245651,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -245323,6 +245666,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -245487,6 +245831,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -245497,6 +245842,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -245511,6 +245857,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -245801,6 +246148,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus AND gpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -245811,6 +246159,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -245825,6 +246174,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -245839,6 +246189,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -246021,6 +246372,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -246031,6 +246383,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -246195,6 +246548,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -246205,6 +246559,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -246441,6 +246796,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -246451,6 +246807,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -246804,6 +247161,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -246814,6 +247172,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -246915,6 +247274,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -246925,6 +247285,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -247080,6 +247441,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -247090,6 +247452,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -250278,6 +250641,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -250288,6 +250652,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -250416,6 +250781,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -250426,6 +250792,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -250440,6 +250807,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -250541,6 +250909,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -250551,6 +250920,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -250679,6 +251049,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -250689,6 +251060,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -251114,6 +251486,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -251124,6 +251497,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
@@ -251369,6 +251743,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -251379,6 +251754,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -251471,6 +251847,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -251481,6 +251858,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -251546,6 +251924,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -251556,6 +251935,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -253862,6 +254242,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -253872,6 +254253,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -253886,6 +254268,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -253900,6 +254283,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -253914,6 +254298,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -254015,6 +254400,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -254025,6 +254411,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -254198,6 +254585,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -254208,6 +254596,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -254336,6 +254725,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -254346,6 +254736,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -254607,6 +254998,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -254617,6 +255009,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
@@ -254672,6 +255065,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -254682,6 +255076,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -254696,6 +255091,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -254710,6 +255106,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -254724,6 +255121,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -254852,6 +255250,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -254862,6 +255261,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -255098,6 +255498,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -255108,6 +255509,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -410432,6 +410834,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -410442,6 +410845,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -410534,6 +410938,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -410544,6 +410949,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -412076,6 +412482,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -412086,6 +412493,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -412100,6 +412508,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -412114,6 +412523,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -412539,6 +412949,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -412549,6 +412960,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -412785,6 +413197,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -412795,6 +413208,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -412878,6 +413292,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -412888,6 +413303,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -412998,6 +413414,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -413008,6 +413425,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -413154,6 +413572,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -413164,6 +413583,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -413247,6 +413667,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -413257,6 +413678,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -413340,6 +413762,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0",
+              "license_expression_spdx": "LGPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -413350,6 +413773,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0",
+                  "spdx_license_expression": "LGPL-2.0-only",
                   "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
@@ -413469,6 +413893,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -413479,6 +413904,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -413493,6 +413919,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -413507,6 +413934,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -413599,6 +414027,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -413609,6 +414038,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -413701,6 +414131,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -413711,6 +414142,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -413821,6 +414253,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -413831,6 +414264,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -414067,6 +414501,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -414077,6 +414512,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -414691,6 +415127,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-3.0-plus AND gpl-3.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -414701,6 +415138,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -414715,6 +415153,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -414729,6 +415168,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -414911,6 +415351,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -414921,6 +415362,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -415004,6 +415446,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -415014,6 +415457,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -416042,6 +416486,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -416052,6 +416497,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -416576,6 +417022,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -416586,6 +417033,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -416651,6 +417099,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -416661,6 +417110,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -417941,6 +418391,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -417951,6 +418402,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -418097,6 +418549,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -418107,6 +418560,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -418280,6 +418734,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -418290,6 +418745,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -418418,6 +418874,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -418428,6 +418885,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -418520,6 +418978,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -418530,6 +418989,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -418544,6 +419004,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -418690,6 +419151,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -418700,6 +419162,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -419143,6 +419606,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -419153,6 +419617,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -419281,6 +419746,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -419291,6 +419757,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -419428,6 +419895,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -419438,6 +419906,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -420241,6 +420710,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -420251,6 +420721,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -420640,6 +421111,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -420650,6 +421122,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -424135,6 +424608,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -424145,6 +424619,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -424237,6 +424712,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus AND gpl-2.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -424247,6 +424723,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -424261,6 +424738,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -424479,6 +424957,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0",
+              "license_expression_spdx": "LGPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -424489,6 +424968,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0",
+                  "spdx_license_expression": "LGPL-2.0-only",
                   "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
@@ -424815,6 +425295,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -424825,6 +425306,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -424980,6 +425462,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -424990,6 +425473,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
@@ -425073,6 +425557,7 @@
           "license_detections": [
             {
               "license_expression": "mpl-2.0",
+              "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -425083,6 +425568,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
                   "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
@@ -425175,6 +425661,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -425185,6 +425672,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -425286,6 +425774,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-3.0-plus",
+              "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -425296,6 +425785,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
                   "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
@@ -425397,6 +425887,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -425407,6 +425898,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -425544,6 +426036,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -425554,6 +426047,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -425682,6 +426176,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -425692,6 +426187,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -425829,6 +426325,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -425839,6 +426336,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -425976,6 +426474,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -425986,6 +426485,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -426000,6 +426500,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -426014,6 +426515,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -426853,6 +427355,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -426863,6 +427366,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -427216,6 +427720,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -427226,6 +427731,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -427318,6 +427824,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -427328,6 +427835,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -427510,6 +428018,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus",
+              "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -427520,6 +428029,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -427534,6 +428044,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -427635,6 +428146,7 @@
           "license_detections": [
             {
               "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
                   "score": 99.0,
@@ -427645,6 +428157,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
                   "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
@@ -427755,6 +428268,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -427765,6 +428279,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -428991,6 +429506,7 @@
           "license_detections": [
             {
               "license_expression": "lgpl-2.0-plus",
+              "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -429001,6 +429517,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -429102,6 +429619,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-3.0-plus",
+              "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
                   "score": 100.0,
@@ -429112,6 +429630,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
                   "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
@@ -429213,6 +429732,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0 AND gpl-2.0-plus AND lgpl-2.0-plus AND public-domain",
+              "license_expression_spdx": "GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 100.0,
@@ -429223,6 +429743,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -429237,6 +429758,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
                   "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
@@ -429251,6 +429773,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
                   "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
@@ -429265,6 +429788,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 229badcb022..9a683e5c5c8 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -348,6 +350,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -358,6 +361,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 229badcb022..9a683e5c5c8 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
@@ -30,6 +30,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -40,6 +41,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -348,6 +350,7 @@
     "license_detections": [
       {
         "license_expression": "public-domain",
+        "license_expression_spdx": "LicenseRef-scancode-public-domain",
         "matches": [
           {
             "score": 70.0,
@@ -358,6 +361,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "public-domain",
+            "spdx_license_expression": "LicenseRef-scancode-public-domain",
             "rule_identifier": "public-domain_bare_words.RULE",
             "rule_relevance": 70,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
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 946d9bb396d..d220462fe6c 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
@@ -43,6 +43,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -53,6 +54,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 11dd68fd300..321cc181d85 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
@@ -57,6 +57,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -67,6 +68,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 72a89125f6e..a6662221bc9 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "proprietary-license",
+        "license_expression_spdx": "LicenseRef-scancode-proprietary-license",
         "matches": [
           {
             "score": 99.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "proprietary-license",
+            "spdx_license_expression": "LicenseRef-scancode-proprietary-license",
             "rule_identifier": "proprietary-license_507.RULE",
             "rule_relevance": 99,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_507.RULE",
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 e9e5d882186..b349e15f112 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
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
             "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
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 78e919217fb..21bbaa12dc8 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 e4b6bc15ee0..15b07e3f92c 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
@@ -38,6 +38,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 3c7a5932a66..73e6888efd3 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
@@ -50,6 +50,7 @@
     "license_detections": [
       {
         "license_expression": "mit",
+        "license_expression_spdx": "MIT",
         "matches": [
           {
             "score": 100.0,
@@ -60,6 +61,7 @@
             "match_coverage": 100.0,
             "matcher": "1-spdx-id",
             "license_expression": "mit",
+            "spdx_license_expression": "MIT",
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
             "rule_url": null,
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 a217358bdfc..c9f46cad95e 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 75.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
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 edcf14a0ab5..5e4548e14fb 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 75.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
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 5aafed76894..34090a55179 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 1b98d8a7ccf..ae66ab3e67f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 75.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
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 a8247252310..99d253eae64 100644
--- a/tests/packagedcode/data/win_pe/chcp.com.package-expected.json
+++ b/tests/packagedcode/data/win_pe/chcp.com.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 f01953a94eb..7dcc66f0995 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 ff81afeb963..e1e169d2a61 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
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 1b98d8a7ccf..ae66ab3e67f 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
@@ -28,6 +28,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 75.0,
@@ -38,6 +39,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ad65678ddd5bed50985f1d896d812061269049b0",
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 e9275302b7d..6795157fe1e 100644
--- a/tests/packagedcode/data/win_pe/file.exe.package-expected.json
+++ b/tests/packagedcode/data/win_pe/file.exe.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "bsd-simplified-darwin",
+        "license_expression_spdx": "LicenseRef-scancode-bsd-simplified-darwin",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "bsd-simplified-darwin",
+            "spdx_license_expression": "LicenseRef-scancode-bsd-simplified-darwin",
             "rule_identifier": "bsd-simplified-darwin.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE",
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 dfac96b9428..49497958a97 100644
--- a/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json
+++ b/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "lgpl-2.1-plus",
+        "license_expression_spdx": "LGPL-2.1-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_455.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_455.RULE",
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 806080dee59..7f02b987d90 100644
--- a/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json
+++ b/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl-1.0-plus_569.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_569.RULE",
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 47318de3c72..45b93622713 100644
--- a/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json
+++ b/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 1e8f3b94512..bc5f21b152b 100644
--- a/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json
+++ b/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 88.89,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "5-undetected",
             "license_expression": "unknown",
+            "spdx_license_expression": "LicenseRef-scancode-unknown",
             "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
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 5c2b40b3819..d589588e63f 100644
--- a/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json
+++ b/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "gpl-1.0-plus",
+        "license_expression_spdx": "GPL-1.0-or-later",
         "matches": [
           {
             "score": 100.0,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "gpl-1.0-plus",
+            "spdx_license_expression": "GPL-1.0-or-later",
             "rule_identifier": "gpl-1.0-plus_569.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_569.RULE",
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 3d35c7f8685..d48b4fb8f30 100644
--- a/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json
+++ b/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json
@@ -36,6 +36,7 @@
     "license_detections": [
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 66.67,
@@ -46,6 +47,7 @@
             "match_coverage": 100.0,
             "matcher": "1-hash",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "zlib_24.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_24.RULE",
@@ -56,6 +58,7 @@
       },
       {
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "matches": [
           {
             "score": 100.0,
@@ -66,6 +69,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
             "rule_identifier": "zlib_17.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 19cdcbc2eff..865eb927e4c 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -232,6 +234,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -242,6 +245,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 0165793de74..50b136e70a7 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
+      "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
@@ -24,6 +26,7 @@
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
+      "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -35,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
@@ -333,6 +337,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
               "score": 100.0,
@@ -343,6 +348,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
               "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
@@ -437,6 +443,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -447,6 +454,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
               "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index 11749329191..cec2c84cad3 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
+      "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
@@ -24,6 +26,7 @@
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
+      "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -35,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
@@ -187,6 +191,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
               "score": 100.0,
@@ -197,6 +202,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
               "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
@@ -273,6 +279,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -283,6 +290,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
               "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index d5d0c3e1228..6a926fb7d82 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -3,6 +3,7 @@
     {
       "identifier": "lgpl_2_1-694bd705-92dd-1a63-d099-ca6c411c469a",
       "license_expression": "lgpl-2.1",
+      "license_expression_spdx": "LGPL-2.1-only",
       "detection_count": 1,
       "detection_log": [],
       "sample_matches": [
@@ -15,6 +16,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1",
+          "license_expression_spdx": "LGPL-2.1-only",
           "rule_identifier": "lgpl-2.1_38.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE",
@@ -32,6 +34,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1",
+          "license_expression_spdx": "LGPL-2.1-only",
           "matches": [
             {
               "score": 100.0,
@@ -42,6 +45,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
               "rule_identifier": "lgpl-2.1_38.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE",
diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json
index 9e5053ead0d..492fe294ef2 100644
--- a/tests/scancode/data/plugin_only_findings/basic.expected.json
+++ b/tests/scancode/data/plugin_only_findings/basic.expected.json
@@ -5,6 +5,7 @@
     {
       "identifier": "bsd_original_uc-f28cb4d4-6336-ee60-f186-4c1929d3a4b0",
       "license_expression": "bsd-original-uc",
+      "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
@@ -26,6 +28,7 @@
     {
       "identifier": "gpl_2_0_or_bsd_new-1aafbf52-fc7a-3ded-e4ce-3a96e276a0f9",
       "license_expression": "gpl-2.0 OR bsd-new",
+      "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
@@ -72,6 +76,7 @@
       "license_detections": [
         {
           "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
               "score": 100.0,
@@ -82,6 +87,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
               "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
@@ -144,6 +150,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
               "score": 100.0,
@@ -154,6 +161,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
               "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
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 de534595ecb..38c55cddce4 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
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "5-undetected",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
@@ -121,6 +123,7 @@
           "license_detections": [
             {
               "license_expression": "unknown",
+              "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
                   "score": 100.0,
@@ -131,6 +134,7 @@
                   "match_coverage": 100.0,
                   "matcher": "5-undetected",
                   "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
                   "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json
index f1625223ec7..3ef7955cd12 100644
--- a/tests/summarycode/data/classify/with_package_data.expected.json
+++ b/tests/summarycode/data/classify/with_package_data.expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -53,6 +55,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_42.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -650,6 +653,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -660,6 +664,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -674,6 +679,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
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 ce267ee3527..0bfb64262b7 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
@@ -75,6 +75,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -85,6 +86,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -119,6 +121,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 5,
       "sample_matches": [
         {
@@ -130,6 +133,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -140,6 +144,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -151,6 +156,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -161,6 +167,7 @@
     {
       "identifier": "gpl_2_0-864c0c2e-be17-d035-c591-df0235f46a09",
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -172,6 +179,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1336.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
@@ -182,6 +190,7 @@
     {
       "identifier": "lgpl_2_0-3903e697-0f73-0feb-d95d-198a91825d0f",
       "license_expression": "lgpl-2.0",
+      "license_expression_spdx": "LGPL-2.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -193,6 +202,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "rule_identifier": "lgpl-2.0_bare_id.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
@@ -467,6 +477,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -477,6 +488,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -536,6 +548,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -546,6 +559,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -605,6 +619,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -615,6 +630,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -674,6 +690,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
               "score": 80.0,
@@ -684,6 +701,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
               "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
@@ -803,6 +821,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -813,6 +832,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -846,6 +866,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -856,6 +877,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -915,6 +937,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -925,6 +948,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -984,6 +1008,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -994,6 +1019,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
index d19ab575369..cf07cc60791 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -73,6 +75,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 5,
       "sample_matches": [
         {
@@ -84,6 +87,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -94,6 +98,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -105,6 +110,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -115,6 +121,7 @@
     {
       "identifier": "gpl_2_0-864c0c2e-be17-d035-c591-df0235f46a09",
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -126,6 +133,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1336.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
@@ -136,6 +144,7 @@
     {
       "identifier": "lgpl_2_0-3903e697-0f73-0feb-d95d-198a91825d0f",
       "license_expression": "lgpl-2.0",
+      "license_expression_spdx": "LGPL-2.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -147,6 +156,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "rule_identifier": "lgpl-2.0_bare_id.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
@@ -306,6 +316,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -316,6 +327,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -375,6 +387,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -385,6 +398,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -444,6 +458,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -454,6 +469,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -513,6 +529,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
               "score": 80.0,
@@ -523,6 +540,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
               "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
@@ -642,6 +660,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -652,6 +671,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -685,6 +705,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -695,6 +716,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -754,6 +776,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -764,6 +787,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -823,6 +847,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -833,6 +858,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
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 6a63b826430..21ae491301a 100644
--- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
@@ -5,6 +5,7 @@
     {
       "identifier": "apache_2_0-b955b3e8-dd31-4357-9227-7a93de3b06a1",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_2.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
@@ -30,6 +32,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -40,6 +43,7 @@
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0-1e023d4a-9b9a-a032-f999-6d506ad4bcde",
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
+      "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -51,6 +55,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
@@ -65,6 +70,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
@@ -258,6 +264,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus AND gpl-2.0",
+          "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -268,6 +275,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
@@ -281,6 +289,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
@@ -412,6 +421,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus AND gpl-2.0",
+          "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -422,6 +432,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
@@ -435,6 +446,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
@@ -531,6 +543,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -541,6 +554,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
@@ -554,6 +568,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
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 b97dbfcd388..5158e813bbd 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
@@ -5,6 +5,7 @@
     {
       "identifier": "gpl_2_0-20789449-d01b-5c54-146e-d0c746e6368a",
       "license_expression": "gpl-2.0",
+      "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1074.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
@@ -30,6 +32,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_1074.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
@@ -121,6 +124,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -131,6 +135,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
@@ -144,6 +149,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
@@ -213,6 +219,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -223,6 +230,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
@@ -236,6 +244,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
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 d33aa964464..758bce13a61 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
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -73,6 +75,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
       "sample_matches": [
         {
@@ -84,6 +87,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -94,6 +98,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -105,6 +110,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -254,6 +260,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -264,6 +271,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -297,6 +305,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -307,6 +316,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -368,6 +378,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -378,6 +389,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -439,6 +451,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -449,6 +462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -510,6 +524,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -520,6 +535,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -579,6 +595,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -589,6 +606,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -648,6 +666,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -658,6 +677,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
index 5e274c6147e..590d47a2e62 100644
--- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -73,6 +75,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 4,
       "sample_matches": [
         {
@@ -84,6 +87,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -94,6 +98,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -105,6 +110,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -219,6 +225,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -229,6 +236,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -262,6 +270,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -272,6 +281,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
@@ -319,6 +329,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -329,6 +340,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -390,6 +402,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -400,6 +413,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -461,6 +475,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -471,6 +486,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
index f2a8b741df7..622a6a34116 100644
--- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -73,6 +75,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -84,6 +87,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -94,6 +98,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -105,6 +110,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -200,6 +206,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -210,6 +217,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -243,6 +251,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -253,6 +262,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
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 ba74b946ed9..b459a2fc22a 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
@@ -5,6 +5,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 4,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -123,6 +125,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -133,6 +136,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -192,6 +196,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -202,6 +207,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -261,6 +267,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -271,6 +278,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -367,6 +375,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -377,6 +386,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
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 fbbc6e68998..21f03190096 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
@@ -5,6 +5,7 @@
     {
       "identifier": "apache_2_0-b955b3e8-dd31-4357-9227-7a93de3b06a1",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "license-intro_2.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
@@ -30,6 +32,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -40,6 +43,7 @@
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0-1e023d4a-9b9a-a032-f999-6d506ad4bcde",
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
+      "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -51,6 +55,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
@@ -65,6 +70,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
@@ -207,6 +213,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -217,6 +224,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
@@ -230,6 +238,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -289,6 +298,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -299,6 +309,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
@@ -312,6 +323,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
@@ -408,6 +420,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus AND gpl-2.0",
+          "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -418,6 +431,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
@@ -431,6 +445,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
@@ -490,6 +505,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -500,6 +516,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
@@ -513,6 +530,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json
index e8cde4591c7..fe3edec825d 100644
--- a/tests/summarycode/data/score/basic-expected.json
+++ b/tests/summarycode/data/score/basic-expected.json
@@ -49,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -59,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -276,6 +278,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -287,6 +290,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -297,6 +301,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -308,6 +313,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -318,6 +324,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -329,6 +336,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -410,6 +418,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -420,6 +429,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -483,6 +493,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -493,6 +504,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -580,6 +592,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -590,6 +603,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -759,6 +773,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -769,6 +784,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
index 74b9d9a0183..363c233d67b 100644
--- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
+++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -49,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -59,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -276,6 +278,7 @@
     {
       "identifier": "gpl_2_0_plus-1db96703-cb36-48f4-1493-265d3d85eb9e",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -287,6 +290,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
           "rule_relevance": 100,
           "rule_url": null,
@@ -297,6 +301,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -308,6 +313,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -318,6 +324,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -329,6 +336,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -339,6 +347,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -350,6 +359,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -431,6 +441,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -441,6 +452,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -504,6 +516,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -514,6 +527,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -601,6 +615,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -611,6 +626,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -780,6 +796,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -790,6 +807,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -847,6 +865,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -857,6 +876,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-3f844e1a237b3ca425edf1127a3c075a0a0c1de6",
               "rule_relevance": 100,
               "rule_url": null
diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json
index 2f0130a5f17..5f8419010df 100644
--- a/tests/summarycode/data/score/jar-expected.json
+++ b/tests/summarycode/data/score/jar-expected.json
@@ -41,6 +41,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -51,6 +52,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -65,6 +67,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_42.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -228,6 +231,7 @@
     {
       "identifier": "apache_2_0-ab23f79b-ec38-9a8a-9b23-85059407f34d",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -239,6 +243,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE",
@@ -249,6 +254,7 @@
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -260,6 +266,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
@@ -270,6 +277,7 @@
     {
       "identifier": "apache_2_0-4800df2e-4a56-bac0-cac1-9fd31da23344",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -281,6 +289,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1227.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE",
@@ -291,6 +300,7 @@
     {
       "identifier": "apache_2_0-efc1b129-3bcc-a9c0-71ea-964bc53d5512",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -302,6 +312,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -316,6 +327,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -481,6 +493,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -491,6 +504,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE"
@@ -563,6 +577,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -573,6 +588,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE"
@@ -874,6 +890,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -884,6 +901,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
@@ -898,6 +916,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
@@ -1029,6 +1048,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1039,6 +1059,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1227.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE"
@@ -1213,6 +1234,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1223,6 +1245,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
@@ -1286,6 +1309,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1296,6 +1320,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json
index b3bcb19cca9..778a077b0ce 100644
--- a/tests/summarycode/data/score/no_license_ambiguity-expected.json
+++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json
@@ -56,6 +56,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -66,6 +67,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
               "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
@@ -100,6 +102,7 @@
     {
       "identifier": "apache_2_0-e3938c59-cc73-037c-3372-e20c26c25f48",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -111,6 +114,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_875.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE",
@@ -121,6 +125,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-7ff6dd9d-b5e8-3fa4-dd61-c5a634c9b300",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -132,6 +137,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_1060.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE",
@@ -146,6 +152,7 @@
           "match_coverage": 100.0,
           "matcher": "3-seq",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_47.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE",
@@ -156,6 +163,7 @@
     {
       "identifier": "mit-a9138d4e-bc0e-0a20-76fd-237047e6d41c",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -167,6 +175,7 @@
           "match_coverage": 57.69,
           "matcher": "3-seq",
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "rule_identifier": "mit_or_apache-2.0_9.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE",
@@ -181,6 +190,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_154.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE",
@@ -195,6 +205,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -205,6 +216,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -216,6 +228,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -226,6 +239,7 @@
     {
       "identifier": "mit_or_apache_2_0-480eec53-1a80-0150-7c7e-39cf79c9f3a8",
       "license_expression": "mit OR apache-2.0",
+      "license_expression_spdx": "MIT OR Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -237,6 +251,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "rule_identifier": "mit_or_apache-2.0_15.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
@@ -247,6 +262,7 @@
     {
       "identifier": "mit_or_apache_2_0-719f8427-422e-8023-c20e-9f8dd0af13b9",
       "license_expression": "mit OR apache-2.0",
+      "license_expression_spdx": "MIT OR Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -258,6 +274,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "rule_identifier": "mit_or_apache-2.0_14.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE",
@@ -376,6 +393,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 94.12,
@@ -386,6 +404,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_1060.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE"
@@ -399,6 +418,7 @@
               "match_coverage": 100.0,
               "matcher": "3-seq",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_47.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE"
@@ -481,6 +501,7 @@
           "license_detections": [
             {
               "license_expression": "mit OR apache-2.0",
+              "license_expression_spdx": "MIT OR Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -491,6 +512,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit OR apache-2.0",
+                  "spdx_license_expression": "MIT OR Apache-2.0",
                   "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
@@ -529,6 +551,7 @@
       "license_detections": [
         {
           "license_expression": "mit OR apache-2.0",
+          "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -539,6 +562,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
               "rule_identifier": "mit_or_apache-2.0_14.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE"
@@ -606,6 +630,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -616,6 +641,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_875.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE"
@@ -665,6 +691,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -675,6 +702,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -741,6 +769,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 57.69,
@@ -751,6 +780,7 @@
               "match_coverage": 57.69,
               "matcher": "3-seq",
               "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
               "rule_identifier": "mit_or_apache-2.0_9.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE"
@@ -764,6 +794,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_154.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE"
@@ -777,6 +808,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json
index e16e4827479..56bc4d590fd 100644
--- a/tests/summarycode/data/score/no_license_text-expected.json
+++ b/tests/summarycode/data/score/no_license_text-expected.json
@@ -49,6 +49,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -59,6 +60,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -276,6 +278,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -287,6 +290,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -297,6 +301,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -308,6 +313,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -507,6 +513,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -517,6 +524,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -686,6 +694,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -696,6 +705,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
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 b59765c8b28..0baba0b2c23 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
@@ -52,6 +52,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -63,6 +64,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -73,6 +75,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -84,6 +87,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -98,6 +102,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -108,6 +113,7 @@
     {
       "identifier": "gpl_1_0_plus_and_gpl_2_0_and_gpl_2_0_plus-d3814696-f4d1-6a85-1134-6baea31b797a",
       "license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
+      "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -119,6 +125,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
@@ -133,6 +140,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
@@ -147,6 +155,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
@@ -157,6 +166,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -168,6 +178,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -298,6 +309,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -308,6 +320,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -357,6 +370,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -367,6 +381,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -455,6 +470,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -465,6 +481,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -478,6 +495,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -588,6 +606,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -598,6 +617,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
               "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
@@ -611,6 +631,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
@@ -624,6 +645,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
               "rule_relevance": 50,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE"
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 276c8533b43..a8637269d2e 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
@@ -40,6 +40,7 @@
     {
       "identifier": "gpl_2_0_plus-9b44ef18-69db-1b2d-f6ce-dd439fc51603",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -51,6 +52,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_119.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
@@ -61,6 +63,7 @@
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -72,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -268,6 +272,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -278,6 +283,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
@@ -483,6 +489,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -493,6 +500,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json
index 4c313150bab..363e3ced376 100644
--- a/tests/summarycode/data/summary/holders/clear_holder.expected.json
+++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json
@@ -40,6 +40,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -51,6 +52,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -61,6 +63,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -72,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -86,6 +90,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -96,6 +101,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -107,6 +113,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -186,6 +193,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -196,6 +204,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -209,6 +218,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -280,6 +290,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -290,6 +301,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -339,6 +351,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -349,6 +362,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -437,6 +451,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -447,6 +462,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -460,6 +476,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -560,6 +577,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -570,6 +588,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -583,6 +602,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json
index 3b0c6251ab6..ea3929f411b 100644
--- a/tests/summarycode/data/summary/holders/combined_holders.expected.json
+++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json
@@ -36,6 +36,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -47,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -57,6 +59,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -68,6 +71,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -82,6 +86,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -92,6 +97,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -103,6 +109,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -182,6 +189,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -192,6 +200,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -205,6 +214,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -276,6 +286,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -286,6 +297,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -335,6 +347,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -345,6 +358,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -433,6 +447,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -443,6 +458,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -456,6 +472,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -544,6 +561,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -554,6 +572,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -567,6 +586,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
index c265ad864b9..47079be7f37 100644
--- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
@@ -40,6 +40,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -51,6 +52,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -61,6 +63,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -72,6 +75,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -202,6 +206,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -212,6 +217,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -261,6 +267,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -271,6 +278,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
index 1c61bf4ef00..5fc9e68051a 100644
--- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
@@ -36,6 +36,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -47,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -57,6 +59,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -68,6 +71,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -82,6 +86,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -92,6 +97,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -103,6 +109,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -182,6 +189,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -192,6 +200,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -205,6 +214,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -266,6 +276,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -276,6 +287,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -325,6 +337,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -335,6 +348,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
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 cef14c7d2d8..725139bdc81 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
@@ -72,6 +72,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -82,6 +83,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -147,6 +149,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -157,6 +160,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -191,6 +195,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -202,6 +207,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -212,6 +218,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -223,6 +230,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -233,6 +241,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -244,6 +253,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -254,6 +264,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -265,6 +276,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -279,6 +291,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -289,6 +302,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -300,6 +314,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -310,6 +325,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -321,6 +337,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -331,6 +348,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -342,6 +360,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -423,6 +442,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -433,6 +453,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -446,6 +467,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -509,6 +531,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -519,6 +542,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -594,6 +618,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -604,6 +629,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -643,6 +669,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -653,6 +680,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -710,6 +738,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -720,6 +749,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -795,6 +825,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -805,6 +836,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -843,6 +875,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -853,6 +886,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
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 2deb21c5ab5..26704702d2c 100644
--- a/tests/summarycode/data/summary/single_file/single_file.expected.json
+++ b/tests/summarycode/data/summary/single_file/single_file.expected.json
@@ -22,6 +22,7 @@
     {
       "identifier": "jetty-a0130d29-e7f1-bc37-111a-fccd6b1c6b58",
       "license_expression": "jetty",
+      "license_expression_spdx": "LicenseRef-scancode-jetty",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -33,6 +34,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "jetty",
+          "license_expression_spdx": "LicenseRef-scancode-jetty",
           "rule_identifier": "jetty.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE",
@@ -112,6 +114,7 @@
       "license_detections": [
         {
           "license_expression": "jetty",
+          "license_expression_spdx": "LicenseRef-scancode-jetty",
           "matches": [
             {
               "score": 100.0,
@@ -122,6 +125,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "jetty",
+              "spdx_license_expression": "LicenseRef-scancode-jetty",
               "rule_identifier": "jetty.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE"
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 25f98d9947c..32dfabd36ca 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
@@ -64,6 +64,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -74,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -84,6 +86,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -94,6 +97,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -131,6 +135,7 @@
     {
       "identifier": "mit-24a5293c-14d7-5403-efac-1a8b7532c0e8",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -142,6 +147,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -152,6 +158,7 @@
     {
       "identifier": "mit-707ccf7a-5c60-0e4c-5844-349c989a00f5",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -163,6 +170,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
@@ -177,6 +185,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -191,6 +200,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -201,6 +211,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -212,6 +223,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -222,6 +234,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -233,6 +246,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -243,6 +257,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -254,6 +269,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -264,6 +280,7 @@
     {
       "identifier": "mit-59433771-4926-870e-d21a-8162cfa060a3",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -275,6 +292,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
@@ -289,6 +307,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -299,6 +318,7 @@
     {
       "identifier": "mit-6e6256c5-00ca-dcb6-8033-2fc4b6ff86be",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -310,6 +330,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -324,6 +345,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -386,6 +408,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -396,6 +419,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -492,6 +516,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -502,6 +527,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -512,6 +538,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -522,6 +549,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -563,6 +591,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -573,6 +602,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -582,6 +612,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -592,6 +623,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
@@ -601,6 +633,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -611,6 +644,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -624,6 +658,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -939,6 +974,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -949,6 +985,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1021,6 +1058,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1031,6 +1069,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
                   "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -1044,6 +1083,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1057,6 +1097,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1097,6 +1138,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1107,6 +1149,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
               "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
@@ -1120,6 +1163,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1133,6 +1177,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -1194,6 +1239,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1204,6 +1250,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -1214,6 +1261,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1224,6 +1272,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
@@ -1266,6 +1315,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -1276,6 +1326,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
@@ -1289,6 +1340,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
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 4b89d366e57..2634caf6bbf 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
@@ -64,6 +64,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -74,6 +75,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
@@ -122,6 +124,7 @@
     {
       "identifier": "apache_2_0-c4e30bcd-ccfd-bbc3-d2f1-196ab911e47d",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -133,6 +136,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
@@ -291,6 +295,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -301,6 +306,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "apache-2.0_7.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
@@ -349,6 +355,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -359,6 +366,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
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 c4c3abff36b..e8493fb5ea0 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
@@ -68,6 +68,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -78,6 +79,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -112,6 +114,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -123,6 +126,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -133,6 +137,7 @@
     {
       "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -144,6 +149,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -154,6 +160,7 @@
     {
       "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -165,6 +172,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
@@ -175,6 +183,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -186,6 +195,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -200,6 +210,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -210,6 +221,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -221,6 +233,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -302,6 +315,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -312,6 +326,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -325,6 +340,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -388,6 +404,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -398,6 +415,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -449,6 +467,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -459,6 +478,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -534,6 +554,7 @@
           "license_detections": [
             {
               "license_expression": "apache-2.0",
+              "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
                   "score": 100.0,
@@ -544,6 +565,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
                   "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
@@ -582,6 +604,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -592,6 +615,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
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 a7e6ae5abf5..9b7987ccbbc 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
@@ -36,6 +36,7 @@
     {
       "identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
       "license_expression": "apache-2.0",
+      "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -47,6 +48,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
@@ -57,6 +59,7 @@
     {
       "identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+      "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -68,6 +71,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
@@ -82,6 +86,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
@@ -92,6 +97,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -103,6 +109,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -182,6 +189,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
+          "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
               "score": 80.0,
@@ -192,6 +200,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
@@ -205,6 +214,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
               "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
@@ -266,6 +276,7 @@
       "license_detections": [
         {
           "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -276,6 +287,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
               "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
@@ -325,6 +337,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -335,6 +348,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
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 305140d0a18..e1aa84e0ed4 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
@@ -5,6 +5,7 @@
     {
       "identifier": "gpl_2_0_plus-9b44ef18-69db-1b2d-f6ce-dd439fc51603",
       "license_expression": "gpl-2.0-plus",
+      "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -16,6 +17,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "rule_identifier": "gpl-2.0-plus_119.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
@@ -26,6 +28,7 @@
     {
       "identifier": "gpl_3_0_plus-494d0068-7138-a14f-4cbb-fd2137263a4f",
       "license_expression": "gpl-3.0-plus",
+      "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -37,6 +40,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
@@ -301,6 +305,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -311,6 +316,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
               "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
@@ -525,6 +531,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -535,6 +542,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
               "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
index f27ec88be97..62fed533624 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
@@ -2212,6 +2212,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -2222,6 +2223,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "rule_relevance": 50,
               "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",
@@ -3335,6 +3337,7 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3346,6 +3349,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
           "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",
@@ -3356,6 +3360,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3367,6 +3372,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -3377,6 +3383,7 @@
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3388,6 +3395,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
@@ -3398,6 +3406,7 @@
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
+      "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3409,6 +3418,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
@@ -3419,6 +3429,7 @@
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3430,6 +3441,7 @@
           "match_coverage": 99.69,
           "matcher": "3-seq",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
@@ -3440,6 +3452,7 @@
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+      "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3451,6 +3464,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
@@ -3461,6 +3475,7 @@
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -3472,6 +3487,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
@@ -3482,6 +3498,7 @@
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
+      "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3493,6 +3510,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
@@ -3503,6 +3521,7 @@
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 7,
       "sample_matches": [
         {
@@ -3514,6 +3533,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3528,6 +3548,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3538,6 +3559,7 @@
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3549,6 +3571,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3559,6 +3582,7 @@
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3570,6 +3594,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3580,6 +3605,7 @@
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3591,6 +3617,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -3914,6 +3941,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -3924,6 +3952,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -3982,6 +4011,7 @@
       "license_detections": [
         {
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
               "score": 100.0,
@@ -3992,6 +4022,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
               "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
@@ -4056,6 +4087,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4066,6 +4098,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4208,6 +4241,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4218,6 +4252,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4390,6 +4425,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4400,6 +4436,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -4413,6 +4450,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -4474,6 +4512,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4484,6 +4523,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -4542,6 +4582,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4552,6 +4593,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -4565,6 +4607,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -4626,6 +4669,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 99.69,
@@ -4636,6 +4680,7 @@
               "match_coverage": 99.69,
               "matcher": "3-seq",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
@@ -6886,6 +6931,7 @@
           "license_detections": [
             {
               "license_expression": "artistic-2.0",
+              "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
                   "score": 50.0,
@@ -6896,6 +6942,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
                   "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "rule_relevance": 50,
                   "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",
@@ -7700,6 +7747,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -7710,6 +7758,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
@@ -7834,6 +7883,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
               "score": 100.0,
@@ -7844,6 +7894,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
               "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
@@ -7902,6 +7953,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -7912,6 +7964,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -7925,6 +7978,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -7986,6 +8040,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -7996,6 +8051,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8009,6 +8065,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8070,6 +8127,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8080,6 +8138,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8093,6 +8152,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8238,6 +8298,7 @@
       "license_detections": [
         {
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -8248,6 +8309,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
               "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
@@ -8342,6 +8404,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8352,6 +8415,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
@@ -8452,6 +8516,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8462,6 +8527,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8520,6 +8586,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8530,6 +8597,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8624,6 +8692,7 @@
       "license_detections": [
         {
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
               "score": 100.0,
@@ -8634,6 +8703,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
               "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
@@ -8692,6 +8762,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8702,6 +8773,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8760,6 +8832,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8770,6 +8843,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8783,6 +8857,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8844,6 +8919,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8854,6 +8930,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8867,6 +8944,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
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 99e94abf9a4..aa2d3b735b7 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
@@ -2212,6 +2212,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -2222,6 +2223,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "rule_relevance": 50,
               "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",
@@ -3335,6 +3337,7 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3346,6 +3349,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
           "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",
@@ -3356,6 +3360,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3367,6 +3372,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -3377,6 +3383,7 @@
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3388,6 +3395,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
@@ -3398,6 +3406,7 @@
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
+      "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3409,6 +3418,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
@@ -3419,6 +3429,7 @@
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3430,6 +3441,7 @@
           "match_coverage": 99.69,
           "matcher": "3-seq",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
@@ -3440,6 +3452,7 @@
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+      "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3451,6 +3464,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
@@ -3461,6 +3475,7 @@
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -3472,6 +3487,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
@@ -3482,6 +3498,7 @@
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
+      "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3493,6 +3510,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
@@ -3503,6 +3521,7 @@
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 7,
       "sample_matches": [
         {
@@ -3514,6 +3533,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3528,6 +3548,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3538,6 +3559,7 @@
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3549,6 +3571,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3559,6 +3582,7 @@
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3570,6 +3594,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3580,6 +3605,7 @@
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3591,6 +3617,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -4176,6 +4203,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4186,6 +4214,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4255,6 +4284,7 @@
       "license_detections": [
         {
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
               "score": 100.0,
@@ -4265,6 +4295,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
               "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
@@ -4345,6 +4376,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4355,6 +4387,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4518,6 +4551,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4528,6 +4562,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4735,6 +4770,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4745,6 +4781,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -4758,6 +4795,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -4824,6 +4862,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4834,6 +4873,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -4914,6 +4954,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -4924,6 +4965,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -4937,6 +4979,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -5003,6 +5046,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 99.69,
@@ -5013,6 +5057,7 @@
               "match_coverage": 99.69,
               "matcher": "3-seq",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
@@ -7268,6 +7313,7 @@
           "license_detections": [
             {
               "license_expression": "artistic-2.0",
+              "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
                   "score": 50.0,
@@ -7278,6 +7324,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
                   "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "rule_relevance": 50,
                   "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",
@@ -8082,6 +8129,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -8092,6 +8140,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
@@ -8509,6 +8558,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
               "score": 100.0,
@@ -8519,6 +8569,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
               "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
@@ -8582,6 +8633,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8592,6 +8644,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8605,6 +8658,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8671,6 +8725,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8681,6 +8736,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8694,6 +8750,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8760,6 +8817,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8770,6 +8828,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8783,6 +8842,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8941,6 +9001,7 @@
       "license_detections": [
         {
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -8951,6 +9012,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
               "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
@@ -9059,6 +9121,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9069,6 +9132,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
@@ -9193,6 +9257,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9203,6 +9268,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9266,6 +9332,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9276,6 +9343,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9378,6 +9446,7 @@
       "license_detections": [
         {
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
               "score": 100.0,
@@ -9388,6 +9457,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
               "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
@@ -9457,6 +9527,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9467,6 +9538,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -9541,6 +9613,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9551,6 +9624,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9564,6 +9638,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -9630,6 +9705,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9640,6 +9716,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9653,6 +9730,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
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 117dd3ab6a9..99f4ac39056 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
@@ -2212,6 +2212,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 50.0,
@@ -2222,6 +2223,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "rule_relevance": 50,
               "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",
@@ -3335,6 +3337,7 @@
     {
       "identifier": "artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3346,6 +3349,7 @@
           "match_coverage": 100.0,
           "matcher": "1-hash",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
           "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",
@@ -3356,6 +3360,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3367,6 +3372,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -3377,6 +3383,7 @@
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3388,6 +3395,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
@@ -3398,6 +3406,7 @@
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
+      "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3409,6 +3418,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
@@ -3419,6 +3429,7 @@
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3430,6 +3441,7 @@
           "match_coverage": 99.69,
           "matcher": "3-seq",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
@@ -3440,6 +3452,7 @@
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+      "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3451,6 +3464,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
@@ -3461,6 +3475,7 @@
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -3472,6 +3487,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
@@ -3482,6 +3498,7 @@
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
+      "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3493,6 +3510,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
@@ -3503,6 +3521,7 @@
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 7,
       "sample_matches": [
         {
@@ -3514,6 +3533,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3528,6 +3548,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3538,6 +3559,7 @@
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3549,6 +3571,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -3559,6 +3582,7 @@
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -3570,6 +3594,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -3580,6 +3605,7 @@
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -3591,6 +3617,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -4246,6 +4273,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4256,6 +4284,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4346,6 +4375,7 @@
       "license_detections": [
         {
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
               "score": 100.0,
@@ -4356,6 +4386,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
               "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
@@ -4452,6 +4483,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4462,6 +4494,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -4700,6 +4733,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -4710,6 +4744,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -5026,6 +5061,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -5036,6 +5072,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -5049,6 +5086,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -5142,6 +5180,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -5152,6 +5191,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -5242,6 +5282,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -5252,6 +5293,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -5265,6 +5307,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -5358,6 +5401,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 99.69,
@@ -5368,6 +5412,7 @@
               "match_coverage": 99.69,
               "matcher": "3-seq",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
@@ -7650,6 +7695,7 @@
           "license_detections": [
             {
               "license_expression": "artistic-2.0",
+              "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
                   "score": 50.0,
@@ -7660,6 +7706,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
                   "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "rule_relevance": 50,
                   "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",
@@ -8464,6 +8511,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -8474,6 +8522,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
@@ -8769,6 +8818,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
               "score": 100.0,
@@ -8779,6 +8829,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
               "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
@@ -8869,6 +8920,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8879,6 +8931,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -8892,6 +8945,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -8985,6 +9039,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -8995,6 +9050,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9008,6 +9064,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -9101,6 +9158,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9111,6 +9169,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9124,6 +9183,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -9373,6 +9433,7 @@
       "license_detections": [
         {
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -9383,6 +9444,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
               "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
@@ -9541,6 +9603,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9551,6 +9614,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
@@ -9715,6 +9779,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9725,6 +9790,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9815,6 +9881,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -9825,6 +9892,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -9983,6 +10051,7 @@
       "license_detections": [
         {
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
               "score": 100.0,
@@ -9993,6 +10062,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
               "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
@@ -10083,6 +10153,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -10093,6 +10164,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -10183,6 +10255,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -10193,6 +10266,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -10206,6 +10280,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -10299,6 +10374,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -10309,6 +10385,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -10322,6 +10399,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
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 537005b533d..4ab718fc66d 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
@@ -37,6 +37,7 @@
       {
         "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
         "license_expression": "artistic-2.0",
+        "license_expression_spdx": "Artistic-2.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -48,6 +49,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "artistic-2.0",
+            "license_expression_spdx": "Artistic-2.0",
             "rule_identifier": "artistic-2.0_46.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -58,6 +60,7 @@
       {
         "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
         "license_expression": "boost-1.0",
+        "license_expression_spdx": "BSL-1.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -69,6 +72,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "boost-1.0",
+            "license_expression_spdx": "BSL-1.0",
             "rule_identifier": "boost-1.0_21.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
@@ -79,6 +83,7 @@
       {
         "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
         "license_expression": "cc-by-2.5",
+        "license_expression_spdx": "CC-BY-2.5",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -90,6 +95,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "cc-by-2.5",
+            "license_expression_spdx": "CC-BY-2.5",
             "rule_identifier": "cc-by-2.5_4.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
@@ -100,6 +106,7 @@
       {
         "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
         "license_expression": "cc0-1.0",
+        "license_expression_spdx": "CC0-1.0",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -111,6 +118,7 @@
             "match_coverage": 99.69,
             "matcher": "3-seq",
             "license_expression": "cc0-1.0",
+            "license_expression_spdx": "CC0-1.0",
             "rule_identifier": "cc0-1.0_155.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
@@ -121,6 +129,7 @@
       {
         "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
         "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+        "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -132,6 +141,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+            "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
             "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
@@ -142,6 +152,7 @@
       {
         "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
         "license_expression": "lgpl-2.1-plus",
+        "license_expression_spdx": "LGPL-2.1-or-later",
         "detection_count": 3,
         "sample_matches": [
           {
@@ -153,6 +164,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "lgpl-2.1-plus",
+            "license_expression_spdx": "LGPL-2.1-or-later",
             "rule_identifier": "lgpl-2.1-plus_59.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
@@ -163,6 +175,7 @@
       {
         "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
         "license_expression": "mit-old-style",
+        "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -174,6 +187,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "mit-old-style",
+            "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
             "rule_identifier": "mit-old-style_cmr-no_1.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
@@ -184,6 +198,7 @@
       {
         "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "detection_count": 7,
         "sample_matches": [
           {
@@ -195,6 +210,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "rule_identifier": "zlib_5.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -209,6 +225,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "rule_identifier": "zlib_17.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -219,6 +236,7 @@
       {
         "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "detection_count": 2,
         "sample_matches": [
           {
@@ -230,6 +248,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "rule_identifier": "zlib_5.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -240,6 +259,7 @@
       {
         "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "detection_count": 2,
         "sample_matches": [
           {
@@ -251,6 +271,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "rule_identifier": "zlib_17.RULE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -261,6 +282,7 @@
       {
         "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
         "license_expression": "zlib",
+        "license_expression_spdx": "Zlib",
         "detection_count": 1,
         "sample_matches": [
           {
@@ -272,6 +294,7 @@
             "match_coverage": 100.0,
             "matcher": "2-aho",
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "rule_identifier": "zlib.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -558,6 +581,7 @@
         "license_detections": [
           {
             "license_expression": "cc0-1.0",
+            "license_expression_spdx": "CC0-1.0",
             "matches": [
               {
                 "score": 99.69,
@@ -568,6 +592,7 @@
                 "match_coverage": 99.69,
                 "matcher": "3-seq",
                 "license_expression": "cc0-1.0",
+                "spdx_license_expression": "CC0-1.0",
                 "rule_identifier": "cc0-1.0_155.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
@@ -619,6 +644,7 @@
         "license_detections": [
           {
             "license_expression": "artistic-2.0",
+            "license_expression_spdx": "Artistic-2.0",
             "matches": [
               {
                 "score": 100.0,
@@ -629,6 +655,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "artistic-2.0",
+                "spdx_license_expression": "Artistic-2.0",
                 "rule_identifier": "artistic-2.0_46.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
@@ -768,6 +795,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -778,6 +806,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -791,6 +820,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -857,6 +887,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -867,6 +898,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -930,6 +962,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -940,6 +973,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -953,6 +987,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1101,6 +1136,7 @@
         "license_detections": [
           {
             "license_expression": "lgpl-2.1-plus",
+            "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
                 "score": 100.0,
@@ -1111,6 +1147,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
                 "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -1174,6 +1211,7 @@
         "license_detections": [
           {
             "license_expression": "cc-by-2.5",
+            "license_expression_spdx": "CC-BY-2.5",
             "matches": [
               {
                 "score": 100.0,
@@ -1184,6 +1222,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "cc-by-2.5",
+                "spdx_license_expression": "CC-BY-2.5",
                 "rule_identifier": "cc-by-2.5_4.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
@@ -1253,6 +1292,7 @@
         "license_detections": [
           {
             "license_expression": "lgpl-2.1-plus",
+            "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
                 "score": 100.0,
@@ -1263,6 +1303,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
                 "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -1420,6 +1461,7 @@
         "license_detections": [
           {
             "license_expression": "lgpl-2.1-plus",
+            "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
                 "score": 100.0,
@@ -1430,6 +1472,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
                 "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -1581,6 +1624,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -1591,6 +1635,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1604,6 +1649,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1670,6 +1716,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -1680,6 +1727,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1693,6 +1741,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1759,6 +1808,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -1769,6 +1819,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1782,6 +1833,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1848,6 +1900,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -1858,6 +1911,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1921,6 +1975,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -1931,6 +1986,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1944,6 +2000,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -2010,6 +2067,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -2020,6 +2078,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2033,6 +2092,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -2140,6 +2200,7 @@
         "license_detections": [
           {
             "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+            "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
             "matches": [
               {
                 "score": 100.0,
@@ -2150,6 +2211,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+                "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
                 "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
@@ -2307,6 +2369,7 @@
         "license_detections": [
           {
             "license_expression": "boost-1.0",
+            "license_expression_spdx": "BSL-1.0",
             "matches": [
               {
                 "score": 100.0,
@@ -2317,6 +2380,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "boost-1.0",
+                "spdx_license_expression": "BSL-1.0",
                 "rule_identifier": "boost-1.0_21.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
@@ -2421,6 +2485,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -2431,6 +2496,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib.LICENSE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
@@ -2541,6 +2607,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -2551,6 +2618,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2614,6 +2682,7 @@
         "license_detections": [
           {
             "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "matches": [
               {
                 "score": 100.0,
@@ -2624,6 +2693,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
                 "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2728,6 +2798,7 @@
         "license_detections": [
           {
             "license_expression": "mit-old-style",
+            "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
             "matches": [
               {
                 "score": 100.0,
@@ -2738,6 +2809,7 @@
                 "match_coverage": 100.0,
                 "matcher": "2-aho",
                 "license_expression": "mit-old-style",
+                "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
                 "rule_identifier": "mit-old-style_cmr-no_1.RULE",
                 "rule_relevance": 100,
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
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 e51ee97ca86..e6131af8af4 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
@@ -3,6 +3,7 @@
     {
       "identifier": "artistic_2_0-c1ede1c6-eb3d-61cc-53ad-abba5e17c732",
       "license_expression": "artistic-2.0",
+      "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
@@ -24,6 +26,7 @@
     {
       "identifier": "boost_1_0-7d91c102-4b73-b55e-398c-cca7ae1e7bf5",
       "license_expression": "boost-1.0",
+      "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -35,6 +38,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
@@ -45,6 +49,7 @@
     {
       "identifier": "cc_by_2_5-2664cdba-0ee6-a527-2588-8a3a1be3ecae",
       "license_expression": "cc-by-2.5",
+      "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -56,6 +61,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
@@ -66,6 +72,7 @@
     {
       "identifier": "cc0_1_0-4be2dd81-b884-28ac-690a-75aff1b0e963",
       "license_expression": "cc0-1.0",
+      "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -77,6 +84,7 @@
           "match_coverage": 99.69,
           "matcher": "3-seq",
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
@@ -87,6 +95,7 @@
     {
       "identifier": "gpl_2_0_plus_with_ada_linking_exception-ca27fab9-344b-58b2-3c05-f3ca150dad7e",
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+      "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -98,6 +107,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
@@ -108,6 +118,7 @@
     {
       "identifier": "lgpl_2_1_plus-3fe3e5e6-cb18-c0a1-f831-f08fab3612c1",
       "license_expression": "lgpl-2.1-plus",
+      "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
       "sample_matches": [
         {
@@ -119,6 +130,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
@@ -129,6 +141,7 @@
     {
       "identifier": "mit_old_style-578ee504-a9b5-6c26-1bb4-fd7b80a664f0",
       "license_expression": "mit-old-style",
+      "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -140,6 +153,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
@@ -150,6 +164,7 @@
     {
       "identifier": "zlib-663c0d51-510f-fca6-b163-671ecb188ff9",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 7,
       "sample_matches": [
         {
@@ -161,6 +176,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -175,6 +191,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -185,6 +202,7 @@
     {
       "identifier": "zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -196,6 +214,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
@@ -206,6 +225,7 @@
     {
       "identifier": "zlib-b04102d0-a663-78b5-de18-9677ee48ce9c",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -217,6 +237,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
@@ -227,6 +248,7 @@
     {
       "identifier": "zlib-f32ae987-c66a-44ce-bd13-c90e0c59aab8",
       "license_expression": "zlib",
+      "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -238,6 +260,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
@@ -588,6 +611,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -598,6 +622,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -657,6 +682,7 @@
       "license_detections": [
         {
           "license_expression": "cc-by-2.5",
+          "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
               "score": 100.0,
@@ -667,6 +693,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
               "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
@@ -732,6 +759,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -742,6 +770,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -887,6 +916,7 @@
       "license_detections": [
         {
           "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
               "score": 100.0,
@@ -897,6 +927,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
               "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
@@ -1073,6 +1104,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1083,6 +1115,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1096,6 +1129,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1158,6 +1192,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1168,6 +1203,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1227,6 +1263,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1237,6 +1274,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1250,6 +1288,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1312,6 +1351,7 @@
       "license_detections": [
         {
           "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
               "score": 99.69,
@@ -1322,6 +1362,7 @@
               "match_coverage": 99.69,
               "matcher": "3-seq",
               "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
               "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
@@ -1369,6 +1410,7 @@
       "license_detections": [
         {
           "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
               "score": 100.0,
@@ -1379,6 +1421,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
               "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
@@ -1506,6 +1549,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
               "score": 100.0,
@@ -1516,6 +1560,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
               "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
@@ -1575,6 +1620,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1585,6 +1631,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1598,6 +1645,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1660,6 +1708,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1670,6 +1719,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1683,6 +1733,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1745,6 +1796,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -1755,6 +1807,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -1768,6 +1821,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -1916,6 +1970,7 @@
       "license_detections": [
         {
           "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
               "score": 100.0,
@@ -1926,6 +1981,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
               "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
@@ -2022,6 +2078,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2032,6 +2089,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
@@ -2134,6 +2192,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2144,6 +2203,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2203,6 +2263,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2213,6 +2274,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2309,6 +2371,7 @@
       "license_detections": [
         {
           "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
               "score": 100.0,
@@ -2319,6 +2382,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
               "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
@@ -2378,6 +2442,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2388,6 +2453,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -2447,6 +2513,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2457,6 +2524,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2470,6 +2538,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
@@ -2532,6 +2601,7 @@
       "license_detections": [
         {
           "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "matches": [
             {
               "score": 100.0,
@@ -2542,6 +2612,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
@@ -2555,6 +2626,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
               "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json
index 966f1c4b571..7a274000e08 100644
--- a/tests/summarycode/data/tallies/packages/expected.json
+++ b/tests/summarycode/data/tallies/packages/expected.json
@@ -29,6 +29,7 @@
       "license_detections": [
         {
           "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
               "score": 70.0,
@@ -39,6 +40,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
               "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -111,6 +113,7 @@
       "license_detections": [
         {
           "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
               "score": 100.0,
@@ -121,6 +124,7 @@
               "match_coverage": 100.0,
               "matcher": "1-hash",
               "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
               "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -186,6 +190,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -196,6 +201,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -1146,6 +1152,7 @@
           "license_detections": [
             {
               "license_expression": "public-domain",
+              "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
                   "score": 70.0,
@@ -1156,6 +1163,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
                   "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
@@ -1248,6 +1256,7 @@
           "license_detections": [
             {
               "license_expression": "gpl-2.0",
+              "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
                   "score": 100.0,
@@ -1258,6 +1267,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-hash",
                   "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
                   "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
@@ -1336,6 +1346,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -1346,6 +1357,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
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 895ad071100..1503b509d09 100644
--- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
+++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
@@ -37,6 +37,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -47,6 +48,7 @@
               "match_coverage": 100.0,
               "matcher": "1-spdx-id",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
               "rule_url": null,
@@ -57,6 +59,7 @@
         },
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -67,6 +70,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -172,6 +176,7 @@
     {
       "identifier": "mit-e634e936-0701-7555-bfaa-1fce0c174838",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 2,
       "sample_matches": [
         {
@@ -183,6 +188,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_12.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE",
@@ -193,6 +199,7 @@
     {
       "identifier": "mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -204,6 +211,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -214,6 +222,7 @@
     {
       "identifier": "mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -225,6 +234,7 @@
           "match_coverage": 100.0,
           "matcher": "1-spdx-id",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
           "rule_url": null,
@@ -235,6 +245,7 @@
     {
       "identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -246,6 +257,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
@@ -256,6 +268,7 @@
     {
       "identifier": "mit-f9ae5fa5-0848-4d18-62fc-d668971434b3",
       "license_expression": "mit",
+      "license_expression_spdx": "MIT",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -267,6 +280,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_272.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
@@ -281,6 +295,7 @@
           "match_coverage": 100.0,
           "matcher": "2-aho",
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -391,6 +406,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -401,6 +417,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
@@ -460,6 +477,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -470,6 +488,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_12.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE"
@@ -566,6 +585,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -576,6 +596,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_12.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE"
@@ -664,6 +685,7 @@
           "license_detections": [
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -674,6 +696,7 @@
                   "match_coverage": 100.0,
                   "matcher": "1-spdx-id",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
                   "rule_url": null,
@@ -684,6 +707,7 @@
             },
             {
               "license_expression": "mit",
+              "license_expression_spdx": "MIT",
               "matches": [
                 {
                   "score": 100.0,
@@ -694,6 +718,7 @@
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
                   "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "rule_identifier": "mit_30.RULE",
                   "rule_relevance": 100,
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
@@ -778,6 +803,7 @@
       "license_detections": [
         {
           "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "matches": [
             {
               "score": 100.0,
@@ -788,6 +814,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_272.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE"
@@ -801,6 +828,7 @@
               "match_coverage": 100.0,
               "matcher": "2-aho",
               "license_expression": "mit",
+              "spdx_license_expression": "MIT",
               "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
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 3ec987225dc..d79cdd51645 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
@@ -8,6 +8,7 @@
       },
       "detection": {
         "license_expression": "borceux",
+        "license_expression_spdx": "Borceux",
         "matches": [
           {
             "score": 4.71,
@@ -18,6 +19,7 @@
             "match_coverage": 4.71,
             "matcher": "3-seq",
             "license_expression": "borceux",
+            "license_expression_spdx": "Borceux",
             "rule_identifier": "borceux.LICENSE",
             "rule_relevance": 100,
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
@@ -55,6 +57,7 @@
           "match_coverage": 4.71,
           "matcher": "3-seq",
           "license_expression": "borceux",
+          "spdx_license_expression": "Borceux",
           "rule_identifier": "borceux.LICENSE",
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
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 b2ecf84ac59..6eb19e2167d 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
@@ -3,6 +3,7 @@
     {
       "identifier": "unknown-b0897d47-1c91-9898-2364-2e4d1a34b6fd",
       "license_expression": "unknown",
+      "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
       "detection_log": [
         "unknown-match"
@@ -17,6 +18,7 @@
           "match_coverage": 100.0,
           "matcher": "6-unknown",
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
           "rule_relevance": 100,
           "rule_url": null,
@@ -33,6 +35,7 @@
       },
       "detection": {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 86.89,
@@ -43,6 +46,7 @@
             "match_coverage": 100.0,
             "matcher": "6-unknown",
             "license_expression": "unknown",
+            "license_expression_spdx": "LicenseRef-scancode-unknown",
             "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
             "rule_relevance": 100,
             "rule_url": null,
@@ -72,6 +76,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 86.89,
@@ -82,6 +87,7 @@
               "match_coverage": 100.0,
               "matcher": "6-unknown",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
               "rule_url": null,
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 da9f48191b6..96dcc0ab217 100644
--- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
+++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
@@ -3,6 +3,7 @@
     {
       "identifier": "unknown-b0897d47-1c91-9898-2364-2e4d1a34b6fd",
       "license_expression": "unknown",
+      "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
       "sample_matches": [
         {
@@ -14,6 +15,7 @@
           "match_coverage": 100.0,
           "matcher": "6-unknown",
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
           "rule_relevance": 100,
           "rule_url": null,
@@ -30,6 +32,7 @@
       },
       "detection": {
         "license_expression": "unknown",
+        "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
             "score": 86.89,
@@ -40,6 +43,7 @@
             "match_coverage": 100.0,
             "matcher": "6-unknown",
             "license_expression": "unknown",
+            "license_expression_spdx": "LicenseRef-scancode-unknown",
             "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
             "rule_relevance": 100,
             "rule_url": null,
@@ -67,6 +71,7 @@
       "license_detections": [
         {
           "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
               "score": 86.89,
@@ -77,6 +82,7 @@
               "match_coverage": 100.0,
               "matcher": "6-unknown",
               "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
               "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
               "rule_url": null,

From 00437e18cba3272346f20da95d43697c48e00021 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Tue, 12 Dec 2023 23:00:39 +0530
Subject: [PATCH 06/11] Reorder license match attributes

Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/detection.py                 |   25 +-
 src/licensedcode/match.py                     |   15 +-
 src/licensedcode/models.py                    |    4 -
 .../data/common/manifests-expected.jsonlines  |  364 +--
 .../data/common/manifests-expected.yaml       |  360 +--
 .../data/csv/livescan/expected.csv            |   34 +-
 .../data/csv/packages/expected-no-root.csv    |    2 +-
 .../data/csv/packages/expected.csv            |    2 +-
 .../yaml/package-and-licenses-expected.yaml   |  144 +-
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |  216 +-
 ...m_0.12.5-1_copyright-detailed.expected.yml |   60 +-
 .../stable_copyright-detailed.expected.yml    |  552 ++--
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |  624 ++--
 .../stable_copyright-detailed.expected.yml    |   36 +-
 .../stable_copyright-detailed.expected.yml    |  120 +-
 .../stable_copyright-detailed.expected.yml    |   60 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |  288 +-
 .../stable_copyright-detailed.expected.yml    |   36 +-
 .../stable_copyright-detailed.expected.yml    |  192 +-
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |   36 +-
 ...sck-static.copyright-detailed.expected.yml |   24 +-
 ...progs-l10n.copyright-detailed.expected.yml |   24 +-
 ...e_libblkid.copyright-detailed.expected.yml |   12 +-
 ...ibcom-err2.copyright-detailed.expected.yml |   12 +-
 ...ble_libss2.copyright-detailed.expected.yml |   12 +-
 ...e_libuuid1.copyright-detailed.expected.yml |   12 +-
 ...e_uuid-dev.copyright-detailed.expected.yml |   12 +-
 ...id-runtime.copyright-detailed.expected.yml |   12 +-
 .../stable_copyright-detailed.expected.yml    |   72 +-
 .../stable_copyright-detailed.expected.yml    |  156 +-
 .../stable_copyright-detailed.expected.yml    |   24 +-
 .../stable_copyright-detailed.expected.yml    |   84 +-
 .../stable_copyright-detailed.expected.yml    |  180 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |  180 +-
 .../stable_copyright-detailed.expected.yml    |  588 ++--
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |  120 +-
 .../stable_copyright-detailed.expected.yml    |  168 +-
 .../stable_copyright-detailed.expected.yml    |  156 +-
 .../stable_copyright-detailed.expected.yml    |   24 +-
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |  108 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |   24 +-
 .../stable_copyright-detailed.expected.yml    |   24 +-
 .../stable_copyright-detailed.expected.yml    |  312 +-
 .../stable_copyright-detailed.expected.yml    |  120 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |   72 +-
 .../stable_copyright-detailed.expected.yml    |  192 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |   60 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |  132 +-
 .../stable_copyright-detailed.expected.yml    |  228 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |   84 +-
 .../stable_copyright-detailed.expected.yml    |   72 +-
 .../p/perl/copyright-detailed.expected.yml    | 2798 ++++++++---------
 .../stable_copyright-detailed.expected.yml    |  840 ++---
 .../stable_copyright-detailed.expected.yml    |   96 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |  144 +-
 .../stable_copyright-detailed.expected.yml    |  156 +-
 .../stable_copyright-detailed.expected.yml    |  120 +-
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright-detailed.expected.yml    |  288 +-
 .../stable_copyright-detailed.expected.yml    |   24 +-
 .../stable_copyright-detailed.expected.yml    |  156 +-
 .../z3/stable_copyright-detailed.expected.yml |   36 +-
 ...rmware-adi.copyright-detailed.expected.yml |   24 +-
 ...d-graphics.copyright-detailed.expected.yml |   24 +-
 ...re-atheros.copyright-detailed.expected.yml |   84 +-
 ...mware-bnx2.copyright-detailed.expected.yml |   12 +-
 ...ware-bnx2x.copyright-detailed.expected.yml |   12 +-
 ...-brcm80211.copyright-detailed.expected.yml |   12 +-
 ...are-cavium.copyright-detailed.expected.yml |   12 +-
 ...ntel-sound.copyright-detailed.expected.yml |  492 +--
 ...intelwimax.copyright-detailed.expected.yml |   12 +-
 ...re-ipw2x00.copyright-detailed.expected.yml |   12 +-
 ...mware-ivtv.copyright-detailed.expected.yml |   12 +-
 ...re-iwlwifi.copyright-detailed.expected.yml |   12 +-
 ...e-libertas.copyright-detailed.expected.yml |   24 +-
 ...ux-nonfree.copyright-detailed.expected.yml |   24 +-
 ...ware-linux.copyright-detailed.expected.yml |   24 +-
 ...sc-nonfree.copyright-detailed.expected.yml |  396 +--
 ...re-myricom.copyright-detailed.expected.yml |   12 +-
 ...-netronome.copyright-detailed.expected.yml |   12 +-
 ...are-netxen.copyright-detailed.expected.yml |   12 +-
 ...qcom-media.copyright-detailed.expected.yml |  240 +-
 ...are-qlogic.copyright-detailed.expected.yml |   72 +-
 ...are-ralink.copyright-detailed.expected.yml |   24 +-
 ...re-realtek.copyright-detailed.expected.yml |   24 +-
 ...re-samsung.copyright-detailed.expected.yml |   12 +-
 ...ware-siano.copyright-detailed.expected.yml |   12 +-
 ...nnectivity.copyright-detailed.expected.yml |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../stable_copyright-detailed.expected.yml    |   48 +-
 .../zlib1g/copyright-detailed.expected.yml    |   12 +-
 .../adduser/copyright-detailed.expected.yml   |   12 +-
 .../doc/apt/copyright-detailed.expected.yml   |   24 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../doc/bash/copyright-detailed.expected.yml  |  168 +-
 .../bsdutils/copyright-detailed.expected.yml  |  228 +-
 .../coreutils/copyright-detailed.expected.yml |  168 +-
 .../doc/dash/copyright-detailed.expected.yml  |   96 +-
 .../debconf/copyright-detailed.expected.yml   |   12 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../diffutils/copyright-detailed.expected.yml |   24 +-
 .../doc/dpkg/copyright-detailed.expected.yml  |  144 +-
 .../e2fsprogs/copyright-detailed.expected.yml |   36 +-
 .../findutils/copyright-detailed.expected.yml |   24 +-
 .../copyright-detailed.expected.yml           |  880 +++---
 .../copyright-detailed.expected.yml           | 1036 +++---
 .../doc/gpgv/copyright-detailed.expected.yml  |  168 +-
 .../doc/grep/copyright-detailed.expected.yml  |   24 +-
 .../doc/gzip/copyright-detailed.expected.yml  |   48 +-
 .../hostname/copyright-detailed.expected.yml  |   12 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../libacl1/copyright-detailed.expected.yml   |   84 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../libattr1/copyright-detailed.expected.yml  |   84 +-
 .../copyright-detailed.expected.yml           |   48 +-
 .../libblkid1/copyright-detailed.expected.yml |  228 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../libc-bin/copyright-detailed.expected.yml  |  288 +-
 .../doc/libc6/copyright-detailed.expected.yml |  288 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../copyright-detailed.expected.yml           |   12 +-
 .../libcrypt1/copyright-detailed.expected.yml |  396 +--
 .../libdb5.3/copyright-detailed.expected.yml  |   60 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../libffi7/copyright-detailed.expected.yml   |   48 +-
 .../copyright-detailed.expected.yml           |  264 +-
 .../libgmp10/copyright-detailed.expected.yml  |   36 +-
 .../copyright-detailed.expected.yml           | 1084 +++----
 .../copyright-detailed.expected.yml           |   72 +-
 .../copyright-detailed.expected.yml           |  528 ++--
 .../copyright-detailed.expected.yml           |  314 +-
 .../libidn2-0/copyright-detailed.expected.yml |   96 +-
 .../copyright-detailed.expected.yml           |  528 ++--
 .../copyright-detailed.expected.yml           |   48 +-
 .../libkrb5-3/copyright-detailed.expected.yml |  528 ++--
 .../liblz4-1/copyright-detailed.expected.yml  |   60 +-
 .../liblzma5/copyright-detailed.expected.yml  |  518 +--
 .../libmount1/copyright-detailed.expected.yml |  228 +-
 .../copyright-detailed.expected.yml           |  314 +-
 .../libnsl2/copyright-detailed.expected.yml   |  168 +-
 .../copyright-detailed.expected.yml           |   96 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../copyright-detailed.expected.yml           |   60 +-
 .../libpcre3/copyright-detailed.expected.yml  |   36 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../copyright-detailed.expected.yml           |   48 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../libsepol1/copyright-detailed.expected.yml |   24 +-
 .../copyright-detailed.expected.yml           |  228 +-
 .../libss2/copyright-detailed.expected.yml    |   12 +-
 .../libssl1.1/copyright-detailed.expected.yml |   12 +-
 .../copyright-detailed.expected.yml           |  132 +-
 .../copyright-detailed.expected.yml           |   60 +-
 .../libtinfo6/copyright-detailed.expected.yml |   36 +-
 .../copyright-detailed.expected.yml           |  108 +-
 .../libudev1/copyright-detailed.expected.yml  |  132 +-
 .../copyright-detailed.expected.yml           |  132 +-
 .../libuuid1/copyright-detailed.expected.yml  |  228 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../libzstd1/copyright-detailed.expected.yml  |   60 +-
 .../doc/login/copyright-detailed.expected.yml |   36 +-
 .../logsave/copyright-detailed.expected.yml   |   36 +-
 .../lsb-base/copyright-detailed.expected.yml  |   36 +-
 .../doc/mawk/copyright-detailed.expected.yml  |   12 +-
 .../doc/mount/copyright-detailed.expected.yml |  228 +-
 .../copyright-detailed.expected.yml           |   36 +-
 .../passwd/copyright-detailed.expected.yml    |   36 +-
 .../perl-base/copyright-detailed.expected.yml | 2642 ++++++++--------
 .../doc/sed/copyright-detailed.expected.yml   |   24 +-
 .../copyright-detailed.expected.yml           |   24 +-
 .../doc/tar/copyright-detailed.expected.yml   |   24 +-
 .../copyright-detailed.expected.yml           |  228 +-
 .../zlib1g/copyright-detailed.expected.yml    |   12 +-
 .../stable_copyright.expected.yml             |  216 +-
 ...lies_key_files-details.expected.json-lines |  456 +--
 .../no_todo/base64-arraybuffer.expected.json  |  168 +-
 ...ti-orig-tarball-package-expected-diag.json |   32 +-
 .../unknown-license-expected-diag.json        |   42 +-
 .../unknown-license-expected.json             |   42 +-
 205 files changed, 14722 insertions(+), 14734 deletions(-)

diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py
index 4d80c5fbfc5..92fb51675a0 100644
--- a/src/licensedcode/detection.py
+++ b/src/licensedcode/detection.py
@@ -670,32 +670,29 @@ def to_dict(
 
         result = {}
 
-        # Detection Level Information
-        result['score'] = self.score()
+        result['license_expression'] = self.rule.license_expression
+        result['license_expression_spdx'] = self.rule.spdx_license_expression()
         result['from_file'] = self.from_file
         result['start_line'] = self.start_line
         result['end_line'] = self.end_line
+        if rule_details:
+            result.update(self.rule.get_flags_mapping())
+        result['matcher'] = self.matcher
+        result['score'] = self.score()
         result['matched_length'] = self.len()
+        if rule_details:
+            result["rule_length"] = self.rule.length
         result['match_coverage'] = self.coverage()
-        result['matcher'] = self.matcher
-
-        # LicenseDB Level Information (Rule that was matched)
-        result['license_expression'] = self.rule.license_expression
-        result['license_expression_spdx'] = self.rule.spdx_license_expression()
-        result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
+        result['rule_identifier'] = self.rule.identifier
         result['rule_url'] = self.rule.rule_url
-
-        # Extra rule details added optionally
         if rule_details:
-            result.update(self.rule.get_flags_mapping())
-            result["rule_length"] = self.rule.length
-            result["rule_text"] = self.rule.text
             result["rule_notes"] = self.rule.notes
             result["referenced_filenames"] = self.rule.referenced_filenames
-
         if include_text:
             result['matched_text'] = matched_text
+        if rule_details:
+            result["rule_text"] = self.rule.text
 
         return result
 
diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index 69f0d403508..62164b64c8d 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -791,20 +791,17 @@ def to_dict(
 
         result = {}
 
-        # Detection Level Information
-        result['score'] = self.score()
+        result['license_expression'] = self.rule.license_expression
+        result['spdx_license_expression'] = self.rule.spdx_license_expression()
+        result['from_file'] = file_path
         result['start_line'] = self.start_line
         result['end_line'] = self.end_line
-        result['from_file'] = file_path
+        result['matcher'] = self.matcher
+        result['score'] = self.score()
         result['matched_length'] = self.len()
         result['match_coverage'] = self.coverage()
-        result['matcher'] = self.matcher
-
-        # LicenseDB Level Information (Rule that was matched)
-        result['license_expression'] = self.rule.license_expression
-        result['spdx_license_expression'] = self.rule.spdx_license_expression()
-        result['rule_identifier'] = self.rule.identifier
         result['rule_relevance'] = self.rule.relevance
+        result['rule_identifier'] = self.rule.identifier
         result['rule_url'] = self.rule.rule_url
 
         if include_text:
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index 94edcb4588e..5fddb50516d 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -1957,7 +1957,6 @@ def get_flags_mapping(self):
         """
 
         rule_boolean_attributes = [
-            'is_license_text',
             'is_license_text',
             'is_license_notice',
             'is_license_reference',
@@ -1965,9 +1964,6 @@ def get_flags_mapping(self):
             'is_license_intro',
             'is_license_clue',
             'is_continuous',
-            'is_builtin',
-            'is_from_license',
-            'is_synthetic',
         ]
 
         mapping = {}
diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines
index f02a3c53198..e16bd1fc2ff 100644
--- a/tests/formattedcode/data/common/manifests-expected.jsonlines
+++ b/tests/formattedcode/data/common/manifests-expected.jsonlines
@@ -25,6 +25,10 @@
             "python_version": "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]"
           },
           "spdx_license_list_version": "3.22",
+          "additional_license_plugins": [
+            "/home/ayansinha/nexB/write_access/scancode-extra/venv/lib/python3.8/site-packages/licenses_to_install1",
+            "/home/ayansinha/nexB/write_access/scancode-extra/venv/lib/python3.8/site-packages/licenses_to_install2"
+          ],
           "files_count": 4
         }
       }
@@ -64,32 +68,32 @@
             "license_expression_spdx": "CDDL-1.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": "manifests/maven/persistence-api-1.0.pom",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 8,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "cddl-1.0",
-                "spdx_license_expression": "CDDL-1.0",
-                "rule_identifier": "cddl-1.0.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "cddl-1.0.RULE",
                 "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"
               },
               {
-                "score": 100.0,
+                "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "start_line": 2,
                 "end_line": 2,
-                "from_file": "manifests/maven/persistence-api-1.0.pom",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 7,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "cddl-1.0",
-                "spdx_license_expression": "CDDL-1.0",
-                "rule_identifier": "cddl-1.0_4.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "cddl-1.0_4.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
                 "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
               }
@@ -160,17 +164,17 @@
             "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": "manifests/npm-license-mapping/package.json",
+                "matcher": "1-hash",
+                "score": 100.0,
                 "matched_length": 3,
                 "match_coverage": 100.0,
-                "matcher": "1-hash",
-                "license_expression": "apache-2.0",
-                "spdx_license_expression": "Apache-2.0",
-                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "matched_text": "Apache-2.0"
               }
@@ -182,17 +186,17 @@
             "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": "manifests/npm-license-mapping/package.json",
+                "matcher": "1-hash",
+                "score": 100.0,
                 "matched_length": 3,
                 "match_coverage": 100.0,
-                "matcher": "1-hash",
-                "license_expression": "apache-2.0",
-                "spdx_license_expression": "Apache-2.0",
-                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "matched_text": "Apache 2.0"
               }
@@ -259,17 +263,17 @@
             "license_expression_spdx": "MIT",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "mit",
+                "spdx_license_expression": "MIT",
+                "from_file": "manifests/npm-license-string/package.json",
                 "start_line": 1,
                 "end_line": 1,
-                "from_file": "manifests/npm-license-string/package.json",
+                "matcher": "1-spdx-id",
+                "score": 100.0,
                 "matched_length": 1,
                 "match_coverage": 100.0,
-                "matcher": "1-spdx-id",
-                "license_expression": "mit",
-                "spdx_license_expression": "MIT",
-                "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                 "rule_relevance": 100,
+                "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                 "rule_url": null,
                 "matched_text": "MIT"
               }
@@ -521,17 +525,17 @@
         "detection_count": 3,
         "sample_matches": [
           {
-            "score": 100.0,
+            "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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 3,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "apache-2.0",
-            "license_expression_spdx": "Apache-2.0",
-            "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
             "matched_text": null
           }
@@ -544,17 +548,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "apache-2.0",
-            "license_expression_spdx": "Apache-2.0",
-            "rule_identifier": "apache-2.0_65.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "apache-2.0_65.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
             "matched_text": null
           }
@@ -567,32 +571,32 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 16.0,
+            "license_expression": "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,
+            "matcher": "2-aho",
+            "score": 16.0,
             "matched_length": 3,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "unknown-license-reference",
-            "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-            "rule_identifier": "license-intro_72.RULE",
             "rule_relevance": 16,
+            "rule_identifier": "license-intro_72.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE",
             "matched_text": null
           },
           {
-            "score": 82.35,
+            "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,
+            "matcher": "3-seq",
+            "score": 82.35,
             "matched_length": 14,
             "match_coverage": 82.35,
-            "matcher": "3-seq",
-            "license_expression": "cddl-1.0",
-            "license_expression_spdx": "CDDL-1.0",
-            "rule_identifier": "cddl-1.0_32.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "cddl-1.0_32.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE",
             "matched_text": null
           }
@@ -605,32 +609,32 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 8,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "cddl-1.0",
-            "license_expression_spdx": "CDDL-1.0",
-            "rule_identifier": "cddl-1.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "cddl-1.0.RULE",
             "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"
           },
           {
-            "score": 100.0,
+            "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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 7,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "cddl-1.0",
-            "license_expression_spdx": "CDDL-1.0",
-            "rule_identifier": "cddl-1.0_4.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "cddl-1.0_4.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
             "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
           }
@@ -643,17 +647,17 @@
         "detection_count": 2,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "from_file": "manifests/pypi/bluepyopt_setup.py",
             "start_line": 74,
             "end_line": 75,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 10,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-3.0",
-            "license_expression_spdx": "LGPL-3.0-only",
-            "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
             "matched_text": null
           }
@@ -666,17 +670,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "from_file": "manifests/pypi/bluepyopt_setup.py",
             "start_line": 9,
             "end_line": 20,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 106,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-3.0",
-            "license_expression_spdx": "LGPL-3.0-only",
-            "rule_identifier": "lgpl-3.0_276.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-3.0_276.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE",
             "matched_text": null
           }
@@ -689,17 +693,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "from_file": "manifests/pypi/bluepyopt_setup.py",
             "start_line": 65,
             "end_line": 65,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 2,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-3.0",
-            "license_expression_spdx": "LGPL-3.0-only",
-            "rule_identifier": "lgpl-3.0_152.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-3.0_152.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE",
             "matched_text": null
           }
@@ -712,17 +716,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0",
+            "license_expression_spdx": "LGPL-3.0-only",
             "from_file": "manifests/pypi/bluepyopt_setup.py",
             "start_line": 1,
             "end_line": 1,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "lgpl-3.0",
-            "license_expression_spdx": "LGPL-3.0-only",
-            "rule_identifier": "lgpl-3.0_29.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-3.0_29.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
             "matched_text": "LGPLv3"
           }
@@ -735,17 +739,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "from_file": "manifests/npm-license-string/package.json",
             "start_line": 4,
             "end_line": 4,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 2,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "mit",
-            "license_expression_spdx": "MIT",
-            "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "mit_30.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
             "matched_text": null
           }
@@ -758,17 +762,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "license_expression_spdx": "MIT",
             "from_file": "manifests/npm-license-string/package.json",
             "start_line": 1,
             "end_line": 1,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "license_expression_spdx": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_url": null,
             "matched_text": "MIT"
           }
@@ -908,32 +912,32 @@
                 "license_expression_spdx": "CDDL-1.0",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "cddl-1.0",
+                    "spdx_license_expression": "CDDL-1.0",
+                    "from_file": "manifests/maven/persistence-api-1.0.pom",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/maven/persistence-api-1.0.pom",
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 8,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "cddl-1.0",
-                    "spdx_license_expression": "CDDL-1.0",
-                    "rule_identifier": "cddl-1.0.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "cddl-1.0.RULE",
                     "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"
                   },
                   {
-                    "score": 100.0,
+                    "license_expression": "cddl-1.0",
+                    "spdx_license_expression": "CDDL-1.0",
+                    "from_file": "manifests/maven/persistence-api-1.0.pom",
                     "start_line": 2,
                     "end_line": 2,
-                    "from_file": "manifests/maven/persistence-api-1.0.pom",
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 7,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "cddl-1.0",
-                    "spdx_license_expression": "CDDL-1.0",
-                    "rule_identifier": "cddl-1.0_4.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "cddl-1.0_4.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
                     "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
                   }
@@ -970,31 +974,31 @@
             "license_expression_spdx": "CDDL-1.0",
             "matches": [
               {
-                "score": 16.0,
+                "license_expression": "unknown-license-reference",
+                "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "start_line": 17,
                 "end_line": 19,
-                "from_file": "manifests/maven/persistence-api-1.0.pom",
+                "matcher": "2-aho",
+                "score": 16.0,
                 "matched_length": 3,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "unknown-license-reference",
-                "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                "rule_identifier": "license-intro_72.RULE",
                 "rule_relevance": 16,
+                "rule_identifier": "license-intro_72.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
               },
               {
-                "score": 82.35,
+                "license_expression": "cddl-1.0",
+                "spdx_license_expression": "CDDL-1.0",
+                "from_file": "manifests/maven/persistence-api-1.0.pom",
                 "start_line": 18,
                 "end_line": 20,
-                "from_file": "manifests/maven/persistence-api-1.0.pom",
+                "matcher": "3-seq",
+                "score": 82.35,
                 "matched_length": 14,
                 "match_coverage": 82.35,
-                "matcher": "3-seq",
-                "license_expression": "cddl-1.0",
-                "spdx_license_expression": "CDDL-1.0",
-                "rule_identifier": "cddl-1.0_32.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "cddl-1.0_32.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
               }
             ],
@@ -1115,17 +1119,17 @@
                 "license_expression_spdx": "Apache-2.0",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "apache-2.0",
+                    "spdx_license_expression": "Apache-2.0",
+                    "from_file": "manifests/npm-license-mapping/package.json",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/npm-license-mapping/package.json",
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 3,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "apache-2.0",
-                    "spdx_license_expression": "Apache-2.0",
-                    "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "matched_text": "Apache-2.0"
                   }
@@ -1137,17 +1141,17 @@
                 "license_expression_spdx": "Apache-2.0",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "apache-2.0",
+                    "spdx_license_expression": "Apache-2.0",
+                    "from_file": "manifests/npm-license-mapping/package.json",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/npm-license-mapping/package.json",
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 3,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "apache-2.0",
-                    "spdx_license_expression": "Apache-2.0",
-                    "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                     "matched_text": "Apache 2.0"
                   }
@@ -1283,17 +1287,17 @@
             "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "start_line": 6,
                 "end_line": 6,
-                "from_file": "manifests/npm-license-mapping/package.json",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 4,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "apache-2.0",
-                "spdx_license_expression": "Apache-2.0",
-                "rule_identifier": "apache-2.0_65.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "apache-2.0_65.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
               }
             ],
@@ -1304,17 +1308,17 @@
             "license_expression_spdx": "Apache-2.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "apache-2.0",
+                "spdx_license_expression": "Apache-2.0",
+                "from_file": "manifests/npm-license-mapping/package.json",
                 "start_line": 20,
                 "end_line": 20,
-                "from_file": "manifests/npm-license-mapping/package.json",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 3,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "apache-2.0",
-                "spdx_license_expression": "Apache-2.0",
-                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
               }
             ],
@@ -1439,17 +1443,17 @@
                 "license_expression_spdx": "MIT",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "mit",
+                    "spdx_license_expression": "MIT",
+                    "from_file": "manifests/npm-license-string/package.json",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/npm-license-string/package.json",
+                    "matcher": "1-spdx-id",
+                    "score": 100.0,
                     "matched_length": 1,
                     "match_coverage": 100.0,
-                    "matcher": "1-spdx-id",
-                    "license_expression": "mit",
-                    "spdx_license_expression": "MIT",
-                    "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                     "rule_relevance": 100,
+                    "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                     "rule_url": null,
                     "matched_text": "MIT"
                   }
@@ -1535,17 +1539,17 @@
             "license_expression_spdx": "MIT",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "mit",
+                "spdx_license_expression": "MIT",
+                "from_file": "manifests/npm-license-string/package.json",
                 "start_line": 4,
                 "end_line": 4,
-                "from_file": "manifests/npm-license-string/package.json",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 2,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "mit",
-                "spdx_license_expression": "MIT",
-                "rule_identifier": "mit_30.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "mit_30.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
               }
             ],
@@ -1674,17 +1678,17 @@
                 "license_expression_spdx": "LGPL-3.0-only",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-3.0",
+                    "spdx_license_expression": "LGPL-3.0-only",
+                    "from_file": "manifests/pypi/bluepyopt_setup.py",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/pypi/bluepyopt_setup.py",
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 1,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "lgpl-3.0",
-                    "spdx_license_expression": "LGPL-3.0-only",
-                    "rule_identifier": "lgpl-3.0_29.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-3.0_29.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
                     "matched_text": "LGPLv3"
                   }
@@ -1696,17 +1700,17 @@
                 "license_expression_spdx": "LGPL-3.0-only",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-3.0",
+                    "spdx_license_expression": "LGPL-3.0-only",
+                    "from_file": "manifests/pypi/bluepyopt_setup.py",
                     "start_line": 1,
                     "end_line": 1,
-                    "from_file": "manifests/pypi/bluepyopt_setup.py",
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 10,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "lgpl-3.0",
-                    "spdx_license_expression": "LGPL-3.0-only",
-                    "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
                     "matched_text": "- 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)'"
                   }
@@ -1850,17 +1854,17 @@
             "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
+                "from_file": "manifests/pypi/bluepyopt_setup.py",
                 "start_line": 9,
                 "end_line": 20,
-                "from_file": "manifests/pypi/bluepyopt_setup.py",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 106,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-3.0",
-                "spdx_license_expression": "LGPL-3.0-only",
-                "rule_identifier": "lgpl-3.0_276.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "lgpl-3.0_276.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
               }
             ],
@@ -1871,17 +1875,17 @@
             "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
+                "from_file": "manifests/pypi/bluepyopt_setup.py",
                 "start_line": 65,
                 "end_line": 65,
-                "from_file": "manifests/pypi/bluepyopt_setup.py",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 2,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-3.0",
-                "spdx_license_expression": "LGPL-3.0-only",
-                "rule_identifier": "lgpl-3.0_152.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "lgpl-3.0_152.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
               }
             ],
@@ -1892,17 +1896,17 @@
             "license_expression_spdx": "LGPL-3.0-only",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-3.0",
+                "spdx_license_expression": "LGPL-3.0-only",
+                "from_file": "manifests/pypi/bluepyopt_setup.py",
                 "start_line": 74,
                 "end_line": 75,
-                "from_file": "manifests/pypi/bluepyopt_setup.py",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 10,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-3.0",
-                "spdx_license_expression": "LGPL-3.0-only",
-                "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
               }
             ],
diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml
index e37e52541b7..9f78f8c836d 100644
--- a/tests/formattedcode/data/common/manifests-expected.yaml
+++ b/tests/formattedcode/data/common/manifests-expected.yaml
@@ -94,30 +94,30 @@ packages:
       - license_expression: cddl-1.0
         license_expression_spdx: CDDL-1.0
         matches:
-          - score: '100.0'
+          - license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
+            from_file: manifests/maven/persistence-api-1.0.pom
             start_line: 1
             end_line: 1
-            from_file: manifests/maven/persistence-api-1.0.pom
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 8
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: cddl-1.0
-            spdx_license_expression: CDDL-1.0
-            rule_identifier: cddl-1.0.RULE
             rule_relevance: 100
+            rule_identifier: cddl-1.0.RULE
             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'
-          - score: '100.0'
+          - license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
+            from_file: manifests/maven/persistence-api-1.0.pom
             start_line: 2
             end_line: 2
-            from_file: manifests/maven/persistence-api-1.0.pom
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 7
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: cddl-1.0
-            spdx_license_expression: CDDL-1.0
-            rule_identifier: cddl-1.0_4.RULE
             rule_relevance: 100
+            rule_identifier: cddl-1.0_4.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
             matched_text: '  url: http://www.sun.com/cddl/cddl.html'
         identifier: cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880
@@ -175,34 +175,34 @@ packages:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: manifests/npm-license-mapping/package.json
             start_line: 1
             end_line: 1
-            from_file: manifests/npm-license-mapping/package.json
+            matcher: 1-hash
+            score: '100.0'
             matched_length: 3
             match_coverage: '100.0'
-            matcher: 1-hash
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
+            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
             matched_text: Apache-2.0
         identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: manifests/npm-license-mapping/package.json
             start_line: 1
             end_line: 1
-            from_file: manifests/npm-license-mapping/package.json
+            matcher: 1-hash
+            score: '100.0'
             matched_length: 3
             match_coverage: '100.0'
-            matcher: 1-hash
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
+            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
             matched_text: Apache 2.0
         identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
@@ -259,17 +259,17 @@ packages:
       - license_expression: mit
         license_expression_spdx: MIT
         matches:
-          - score: '100.0'
+          - license_expression: mit
+            spdx_license_expression: MIT
+            from_file: manifests/npm-license-string/package.json
             start_line: 1
             end_line: 1
-            from_file: manifests/npm-license-string/package.json
+            matcher: 1-spdx-id
+            score: '100.0'
             matched_length: 1
             match_coverage: '100.0'
-            matcher: 1-spdx-id
-            license_expression: mit
-            spdx_license_expression: MIT
-            rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
             rule_relevance: 100
+            rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
             rule_url:
             matched_text: MIT
         identifier: mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf
@@ -477,17 +477,17 @@ license_detections:
     license_expression_spdx: Apache-2.0
     detection_count: 3
     sample_matches:
-      - score: '100.0'
+      - 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
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_relevance: 100
+        rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
         matched_text: '        "type": "Apache 2.0",'
   - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
@@ -495,17 +495,17 @@ license_detections:
     license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - 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
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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",'
   - identifier: cddl_1_0-c6dbef4d-659c-289f-5ee9-1ca0278edad6
@@ -513,33 +513,33 @@ license_detections:
     license_expression_spdx: CDDL-1.0
     detection_count: 1
     sample_matches:
-      - score: '16.0'
+      - license_expression: 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'
+        matcher: 2-aho
+        score: '16.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unknown-license-reference
-        license_expression_spdx: LicenseRef-scancode-unknown-license-reference
-        rule_identifier: license-intro_72.RULE
         rule_relevance: 16
+        rule_identifier: license-intro_72.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE
         matched_text: |
           
             
               Common Development and Distribution License (CDDL) v1.0
-      - score: '82.35'
+      - 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
+        matcher: 3-seq
+        score: '82.35'
         matched_length: 14
         match_coverage: '82.35'
-        matcher: 3-seq
-        license_expression: cddl-1.0
-        license_expression_spdx: CDDL-1.0
-        rule_identifier: cddl-1.0_32.RULE
         rule_relevance: 100
+        rule_identifier: cddl-1.0_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE
         matched_text: |
           
@@ -550,30 +550,30 @@ license_detections:
     license_expression_spdx: CDDL-1.0
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - 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
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cddl-1.0
-        license_expression_spdx: CDDL-1.0
-        rule_identifier: cddl-1.0.RULE
         rule_relevance: 100
+        rule_identifier: cddl-1.0.RULE
         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'
-      - score: '100.0'
+      - 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
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cddl-1.0
-        license_expression_spdx: CDDL-1.0
-        rule_identifier: cddl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: cddl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
         matched_text: '  url: http://www.sun.com/cddl/cddl.html'
   - identifier: lgpl_3_0-272571eb-5e68-95b6-ddb0-71de2d8df321
@@ -581,17 +581,17 @@ license_detections:
     license_expression_spdx: LGPL-3.0-only
     detection_count: 2
     sample_matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
         start_line: 74
         end_line: 75
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-3.0
-        license_expression_spdx: LGPL-3.0-only
-        rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
         rule_relevance: 100
+        rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
         matched_text: |
           'License :: OSI Approved :: GNU Lesser General Public '
@@ -601,17 +601,17 @@ license_detections:
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
         start_line: 9
         end_line: 20
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-3.0
-        license_expression_spdx: LGPL-3.0-only
-        rule_identifier: lgpl-3.0_276.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0_276.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it under
@@ -631,17 +631,17 @@ license_detections:
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
         start_line: 65
         end_line: 65
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-3.0
-        license_expression_spdx: LGPL-3.0-only
-        rule_identifier: lgpl-3.0_152.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0_152.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE
         matched_text: '    license="LGPLv3",'
   - identifier: lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5
@@ -649,17 +649,17 @@ license_detections:
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0
+        license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
         start_line: 1
         end_line: 1
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0
-        license_expression_spdx: LGPL-3.0-only
-        rule_identifier: lgpl-3.0_29.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0_29.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE
         matched_text: LGPLv3
   - identifier: mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee
@@ -667,17 +667,17 @@ license_detections:
     license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: mit
+        license_expression_spdx: MIT
         from_file: manifests/npm-license-string/package.json
         start_line: 4
         end_line: 4
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        license_expression_spdx: MIT
-        rule_identifier: mit_30.RULE
         rule_relevance: 100
+        rule_identifier: mit_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE
         matched_text: '    "license": "MIT",'
   - identifier: mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf
@@ -685,17 +685,17 @@ license_detections:
     license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: mit
+        license_expression_spdx: MIT
         from_file: manifests/npm-license-string/package.json
         start_line: 1
         end_line: 1
+        matcher: 1-spdx-id
+        score: '100.0'
         matched_length: 1
         match_coverage: '100.0'
-        matcher: 1-spdx-id
-        license_expression: mit
-        license_expression_spdx: MIT
-        rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
         rule_relevance: 100
+        rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
         rule_url:
         matched_text: MIT
 license_references:
@@ -1754,30 +1754,30 @@ files:
           - license_expression: cddl-1.0
             license_expression_spdx: CDDL-1.0
             matches:
-              - score: '100.0'
+              - license_expression: cddl-1.0
+                spdx_license_expression: CDDL-1.0
+                from_file: manifests/maven/persistence-api-1.0.pom
                 start_line: 1
                 end_line: 1
-                from_file: manifests/maven/persistence-api-1.0.pom
+                matcher: 2-aho
+                score: '100.0'
                 matched_length: 8
                 match_coverage: '100.0'
-                matcher: 2-aho
-                license_expression: cddl-1.0
-                spdx_license_expression: CDDL-1.0
-                rule_identifier: cddl-1.0.RULE
                 rule_relevance: 100
+                rule_identifier: cddl-1.0.RULE
                 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'
-              - score: '100.0'
+              - license_expression: cddl-1.0
+                spdx_license_expression: CDDL-1.0
+                from_file: manifests/maven/persistence-api-1.0.pom
                 start_line: 2
                 end_line: 2
-                from_file: manifests/maven/persistence-api-1.0.pom
+                matcher: 2-aho
+                score: '100.0'
                 matched_length: 7
                 match_coverage: '100.0'
-                matcher: 2-aho
-                license_expression: cddl-1.0
-                spdx_license_expression: CDDL-1.0
-                rule_identifier: cddl-1.0_4.RULE
                 rule_relevance: 100
+                rule_identifier: cddl-1.0_4.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE
                 matched_text: '  url: http://www.sun.com/cddl/cddl.html'
             identifier: cddl_1_0-dd3dd7df-afca-6a5e-492c-f7b279fdd880
@@ -1811,33 +1811,33 @@ files:
       - license_expression: cddl-1.0
         license_expression_spdx: CDDL-1.0
         matches:
-          - score: '16.0'
+          - license_expression: unknown-license-reference
+            spdx_license_expression: LicenseRef-scancode-unknown-license-reference
+            from_file: manifests/maven/persistence-api-1.0.pom
             start_line: 17
             end_line: '19'
-            from_file: manifests/maven/persistence-api-1.0.pom
+            matcher: 2-aho
+            score: '16.0'
             matched_length: 3
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: unknown-license-reference
-            spdx_license_expression: LicenseRef-scancode-unknown-license-reference
-            rule_identifier: license-intro_72.RULE
             rule_relevance: 16
+            rule_identifier: license-intro_72.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE
             matched_text: |
               
                 
                   Common Development and Distribution License (CDDL) v1.0
-          - score: '82.35'
+          - license_expression: cddl-1.0
+            spdx_license_expression: CDDL-1.0
+            from_file: manifests/maven/persistence-api-1.0.pom
             start_line: 18
             end_line: 20
-            from_file: manifests/maven/persistence-api-1.0.pom
+            matcher: 3-seq
+            score: '82.35'
             matched_length: 14
             match_coverage: '82.35'
-            matcher: 3-seq
-            license_expression: cddl-1.0
-            spdx_license_expression: CDDL-1.0
-            rule_identifier: cddl-1.0_32.RULE
             rule_relevance: 100
+            rule_identifier: cddl-1.0_32.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE
             matched_text: |
               
@@ -1954,34 +1954,34 @@ files:
           - license_expression: apache-2.0
             license_expression_spdx: Apache-2.0
             matches:
-              - score: '100.0'
+              - license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
+                from_file: manifests/npm-license-mapping/package.json
                 start_line: 1
                 end_line: 1
-                from_file: manifests/npm-license-mapping/package.json
+                matcher: 1-hash
+                score: '100.0'
                 matched_length: 3
                 match_coverage: '100.0'
-                matcher: 1-hash
-                license_expression: apache-2.0
-                spdx_license_expression: Apache-2.0
-                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
+                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 matched_text: Apache-2.0
             identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
           - license_expression: apache-2.0
             license_expression_spdx: Apache-2.0
             matches:
-              - score: '100.0'
+              - license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
+                from_file: manifests/npm-license-mapping/package.json
                 start_line: 1
                 end_line: 1
-                from_file: manifests/npm-license-mapping/package.json
+                matcher: 1-hash
+                score: '100.0'
                 matched_length: 3
                 match_coverage: '100.0'
-                matcher: 1-hash
-                license_expression: apache-2.0
-                spdx_license_expression: Apache-2.0
-                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
+                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 matched_text: Apache 2.0
             identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
@@ -2095,34 +2095,34 @@ files:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: manifests/npm-license-mapping/package.json
             start_line: 6
             end_line: 6
-            from_file: manifests/npm-license-mapping/package.json
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 4
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: apache-2.0_65.RULE
             rule_relevance: 100
+            rule_identifier: apache-2.0_65.RULE
             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",'
         identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: manifests/npm-license-mapping/package.json
             start_line: 20
             end_line: 20
-            from_file: manifests/npm-license-mapping/package.json
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 3
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
+            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
             matched_text: '        "type": "Apache 2.0",'
         identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
@@ -2247,17 +2247,17 @@ files:
           - license_expression: mit
             license_expression_spdx: MIT
             matches:
-              - score: '100.0'
+              - license_expression: mit
+                spdx_license_expression: MIT
+                from_file: manifests/npm-license-string/package.json
                 start_line: 1
                 end_line: 1
-                from_file: manifests/npm-license-string/package.json
+                matcher: 1-spdx-id
+                score: '100.0'
                 matched_length: 1
                 match_coverage: '100.0'
-                matcher: 1-spdx-id
-                license_expression: mit
-                spdx_license_expression: MIT
-                rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
                 rule_relevance: 100
+                rule_identifier: spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06
                 rule_url:
                 matched_text: MIT
             identifier: mit-a822f434-d61f-f2b1-c792-8b8cb9e7b9bf
@@ -2329,17 +2329,17 @@ files:
       - license_expression: mit
         license_expression_spdx: MIT
         matches:
-          - score: '100.0'
+          - license_expression: mit
+            spdx_license_expression: MIT
+            from_file: manifests/npm-license-string/package.json
             start_line: 4
             end_line: 4
-            from_file: manifests/npm-license-string/package.json
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 2
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: mit
-            spdx_license_expression: MIT
-            rule_identifier: mit_30.RULE
             rule_relevance: 100
+            rule_identifier: mit_30.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE
             matched_text: '    "license": "MIT",'
         identifier: mit-3fce6ea2-8abd-6c6b-3ede-a37af7c6efee
@@ -2470,34 +2470,34 @@ files:
           - license_expression: lgpl-3.0
             license_expression_spdx: LGPL-3.0-only
             matches:
-              - score: '100.0'
+              - license_expression: lgpl-3.0
+                spdx_license_expression: LGPL-3.0-only
+                from_file: manifests/pypi/bluepyopt_setup.py
                 start_line: 1
                 end_line: 1
-                from_file: manifests/pypi/bluepyopt_setup.py
+                matcher: 1-hash
+                score: '100.0'
                 matched_length: 1
                 match_coverage: '100.0'
-                matcher: 1-hash
-                license_expression: lgpl-3.0
-                spdx_license_expression: LGPL-3.0-only
-                rule_identifier: lgpl-3.0_29.RULE
                 rule_relevance: 100
+                rule_identifier: lgpl-3.0_29.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE
                 matched_text: LGPLv3
             identifier: lgpl_3_0-38174920-e8ed-7bda-41ec-94df7380b7d5
           - license_expression: lgpl-3.0
             license_expression_spdx: LGPL-3.0-only
             matches:
-              - score: '100.0'
+              - license_expression: lgpl-3.0
+                spdx_license_expression: LGPL-3.0-only
+                from_file: manifests/pypi/bluepyopt_setup.py
                 start_line: 1
                 end_line: 1
-                from_file: manifests/pypi/bluepyopt_setup.py
+                matcher: 1-hash
+                score: '100.0'
                 matched_length: 10
                 match_coverage: '100.0'
-                matcher: 1-hash
-                license_expression: lgpl-3.0
-                spdx_license_expression: LGPL-3.0-only
-                rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
                 rule_relevance: 100
+                rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
                 matched_text: '- ''License :: OSI Approved :: GNU Lesser General Public License
                   v3 (LGPLv3)'''
@@ -2619,17 +2619,17 @@ files:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         matches:
-          - score: '100.0'
+          - license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
+            from_file: manifests/pypi/bluepyopt_setup.py
             start_line: 9
             end_line: 20
-            from_file: manifests/pypi/bluepyopt_setup.py
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 106
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: lgpl-3.0
-            spdx_license_expression: LGPL-3.0-only
-            rule_identifier: lgpl-3.0_276.RULE
             rule_relevance: 100
+            rule_identifier: lgpl-3.0_276.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE
             matched_text: |
               This library is free software; you can redistribute it and/or modify it under
@@ -2648,34 +2648,34 @@ files:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         matches:
-          - score: '100.0'
+          - license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
+            from_file: manifests/pypi/bluepyopt_setup.py
             start_line: 65
             end_line: 65
-            from_file: manifests/pypi/bluepyopt_setup.py
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 2
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: lgpl-3.0
-            spdx_license_expression: LGPL-3.0-only
-            rule_identifier: lgpl-3.0_152.RULE
             rule_relevance: 100
+            rule_identifier: lgpl-3.0_152.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE
             matched_text: '    license="LGPLv3",'
         identifier: lgpl_3_0-2db87bcf-56b4-9d7d-7075-2effae31c631
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         matches:
-          - score: '100.0'
+          - license_expression: lgpl-3.0
+            spdx_license_expression: LGPL-3.0-only
+            from_file: manifests/pypi/bluepyopt_setup.py
             start_line: 74
             end_line: 75
-            from_file: manifests/pypi/bluepyopt_setup.py
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 10
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: lgpl-3.0
-            spdx_license_expression: LGPL-3.0-only
-            rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
             rule_relevance: 100
+            rule_identifier: pypi_gnu_lesser_general_public_license_v3.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE
             matched_text: |
               'License :: OSI Approved :: GNU Lesser General Public '
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index f40143b0c41..ed2b6939cea 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,20 +1,20 @@
-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__score,start_line,end_line,license_match__from_file,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__spdx_license_expression,license_match__rule_identifier,license_match__rule_relevance,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__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
+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__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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,,100.00,5,13,scan/json2csv.rb,85,100.00,2-aho,apache-2.0,Apache-2.0,apache-2.0_7.RULE,100.00,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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+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,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,100.00,1,12,scan/license,113,100.00,1-hash,gpl-2.0-plus,GPL-2.0-or-later,gpl-2.0-plus_420.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+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,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,scan/package.json,3,100.00,2-aho,mit,MIT,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,scan/package.json,136,85.53,3-seq,mit,MIT,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-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': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'from_file': 'scan/package.json', 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, '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,,,,,,,,,,,,,,,,,,,,,,,,,,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 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+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
diff --git a/tests/formattedcode/data/csv/packages/expected-no-root.csv b/tests/formattedcode/data/csv/packages/expected-no-root.csv
index 68486425d69..0935a8bc174 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__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': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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', 'spdx_license_expression': 'Artistic-2.0', 'from_file': None, '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 963bef3f80b..fc6eabd0362 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__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': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'from_file': None, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, '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', 'spdx_license_expression': 'Artistic-2.0', 'from_file': None, '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/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
index 0a1d4ed225f..7e90442ddb1 100644
--- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
+++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
@@ -90,17 +90,17 @@ packages:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: package-and-licenses/setup.cfg
             start_line: 1
             end_line: 1
-            from_file: package-and-licenses/setup.cfg
+            matcher: 1-hash
+            score: '100.0'
             matched_length: 3
             match_coverage: '100.0'
-            matcher: 1-hash
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_relevance: 100
+            rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
             matched_text: Apache-2.0
         identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
@@ -127,17 +127,17 @@ license_detections:
     license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - 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
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1584
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: apache-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: apache-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE
         matched_text: "                                 Apache License\n                   \
           \        Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\
@@ -283,17 +283,17 @@ license_detections:
     license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/setup.cfg
         start_line: 1
         end_line: 1
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_relevance: 100
+        rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
         matched_text: Apache-2.0
   - identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
@@ -301,17 +301,17 @@ license_detections:
     license_expression_spdx: Apache-2.0
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/setup.cfg
         start_line: 4
         end_line: 4
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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
   - identifier: apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39
@@ -319,30 +319,30 @@ license_detections:
     license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
     detection_count: 1
     sample_matches:
-      - score: '80.0'
+      - license_expression: apache-2.0
+        license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/README.txt
         start_line: 3
         end_line: 3
+        matcher: 2-aho
+        score: '80.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        license_expression_spdx: Apache-2.0
-        rule_identifier: apache-2.0_73.RULE
         rule_relevance: 80
+        rule_identifier: apache-2.0_73.RULE
         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
-      - score: '100.0'
+      - 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
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0 OR mit
-        license_expression_spdx: Apache-2.0 OR MIT
-        rule_identifier: apache-2.0_or_mit_36.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_or_mit_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE
         matched_text: This is licensed under Apache-2.0 or MIT
   - identifier: mit-cacd5c0c-204a-85c2-affc-e4c125b2492a
@@ -350,17 +350,17 @@ license_detections:
     license_expression_spdx: MIT
     detection_count: 1
     sample_matches:
-      - score: '100.0'
+      - license_expression: mit
+        license_expression_spdx: MIT
         from_file: package-and-licenses/mit.LICENSE
         start_line: 2
         end_line: '19'
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        license_expression_spdx: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -1057,30 +1057,30 @@ files:
       - license_expression: apache-2.0 AND (apache-2.0 OR mit)
         license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
         matches:
-          - score: '80.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: package-and-licenses/README.txt
             start_line: 3
             end_line: 3
-            from_file: package-and-licenses/README.txt
+            matcher: 2-aho
+            score: '80.0'
             matched_length: 4
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: apache-2.0_73.RULE
             rule_relevance: 80
+            rule_identifier: apache-2.0_73.RULE
             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
-          - score: '100.0'
+          - license_expression: apache-2.0 OR mit
+            spdx_license_expression: Apache-2.0 OR MIT
+            from_file: package-and-licenses/README.txt
             start_line: 3
             end_line: 3
-            from_file: package-and-licenses/README.txt
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 5
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: apache-2.0 OR mit
-            spdx_license_expression: Apache-2.0 OR MIT
-            rule_identifier: apache-2.0_or_mit_36.RULE
             rule_relevance: 100
+            rule_identifier: apache-2.0_or_mit_36.RULE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE
             matched_text: This is licensed under Apache-2.0 or MIT
         identifier: apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39
@@ -1133,17 +1133,17 @@ files:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: package-and-licenses/apache-2.0.LICENSE
             start_line: 2
             end_line: 202
-            from_file: package-and-licenses/apache-2.0.LICENSE
+            matcher: 1-hash
+            score: '100.0'
             matched_length: 1584
             match_coverage: '100.0'
-            matcher: 1-hash
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: apache-2.0.LICENSE
             rule_relevance: 100
+            rule_identifier: apache-2.0.LICENSE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE
             matched_text: "                                 Apache License\n               \
               \            Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\
@@ -1342,17 +1342,17 @@ files:
       - license_expression: mit
         license_expression_spdx: MIT
         matches:
-          - score: '100.0'
+          - license_expression: mit
+            spdx_license_expression: MIT
+            from_file: package-and-licenses/mit.LICENSE
             start_line: 2
             end_line: '19'
-            from_file: package-and-licenses/mit.LICENSE
+            matcher: 1-hash
+            score: '100.0'
             matched_length: 161
             match_coverage: '100.0'
-            matcher: 1-hash
-            license_expression: mit
-            spdx_license_expression: MIT
-            rule_identifier: mit.LICENSE
             rule_relevance: 100
+            rule_identifier: mit.LICENSE
             rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
             matched_text: |
               Permission is hereby granted, free of charge, to any person obtaining
@@ -1438,17 +1438,17 @@ files:
           - license_expression: apache-2.0
             license_expression_spdx: Apache-2.0
             matches:
-              - score: '100.0'
+              - license_expression: apache-2.0
+                spdx_license_expression: Apache-2.0
+                from_file: package-and-licenses/setup.cfg
                 start_line: 1
                 end_line: 1
-                from_file: package-and-licenses/setup.cfg
+                matcher: 1-hash
+                score: '100.0'
                 matched_length: 3
                 match_coverage: '100.0'
-                matcher: 1-hash
-                license_expression: apache-2.0
-                spdx_license_expression: Apache-2.0
-                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_relevance: 100
+                rule_identifier: spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE
                 matched_text: Apache-2.0
             identifier: apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8
@@ -1479,17 +1479,17 @@ files:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         matches:
-          - score: '100.0'
+          - license_expression: apache-2.0
+            spdx_license_expression: Apache-2.0
+            from_file: package-and-licenses/setup.cfg
             start_line: 4
             end_line: 4
-            from_file: package-and-licenses/setup.cfg
+            matcher: 2-aho
+            score: '100.0'
             matched_length: 4
             match_coverage: '100.0'
-            matcher: 2-aho
-            license_expression: apache-2.0
-            spdx_license_expression: Apache-2.0
-            rule_identifier: apache-2.0_65.RULE
             rule_relevance: 100
+            rule_identifier: apache-2.0_65.RULE
             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
         identifier: apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0
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 be446327d95..4a152b05c89 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
@@ -11,17 +11,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 16
         end_line: 33
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
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 02c90368dd8..50c20e2c504 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,30 +48,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 71
         end_line: 71
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 72
         end_line: 88
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_971.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_971.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_971.RULE
         matched_text: |
           Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,17 +95,17 @@ other_license_detections:
   - license_expression: zeusbench
     license_expression_spdx: LicenseRef-scancode-zeusbench
     matches:
-      - score: '100.0'
+      - license_expression: zeusbench
+        spdx_license_expression: LicenseRef-scancode-zeusbench
+        from_file:
         start_line: 94
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zeusbench
-        spdx_license_expression: LicenseRef-scancode-zeusbench
-        rule_identifier: zeusbench_1.RULE
         rule_relevance: 100
+        rule_identifier: zeusbench_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zeusbench_1.RULE
         matched_text: |
           This software is provided "as is" and any express or implied warranties,
@@ -122,17 +122,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 118
         end_line: 142
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_879.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -164,17 +164,17 @@ other_license_detections:
   - license_expression: x11-keith-packard AND metamail
     license_expression_spdx: HPND-sell-variant AND metamail
     matches:
-      - score: '100.0'
+      - license_expression: x11-keith-packard
+        spdx_license_expression: HPND-sell-variant
+        from_file:
         start_line: 172
         end_line: '191'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 168
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-keith-packard
-        spdx_license_expression: HPND-sell-variant
-        rule_identifier: x11-keith-packard3.RULE
         rule_relevance: 100
+        rule_identifier: x11-keith-packard3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-keith-packard3.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software
@@ -197,17 +197,17 @@ other_license_detections:
           AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
           OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
           SOFTWARE.
-      - score: '100.0'
+      - license_expression: metamail
+        spdx_license_expression: metamail
+        from_file:
         start_line: '197'
         end_line: 206
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: metamail
-        spdx_license_expression: metamail
-        rule_identifier: metamail.LICENSE
         rule_relevance: 100
+        rule_identifier: metamail.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this material
@@ -224,30 +224,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 209
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '99.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 210
         end_line: 222
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_483.RULE
         rule_relevance: 99
+        rule_identifier: gpl-3.0-plus_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_483.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -267,30 +267,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 224
         end_line: 224
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 225
         end_line: 237
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_986.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_986.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_986.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -310,17 +310,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 240
         end_line: 272
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_361.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_361.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_361.RULE
         matched_text: |
           This imagemap module started as a port of the original imagemap.c
@@ -360,17 +360,17 @@ other_license_detections:
   - license_expression: bsd-simplified-darwin
     license_expression_spdx: LicenseRef-scancode-bsd-simplified-darwin
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified-darwin
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
+        from_file:
         start_line: 279
         end_line: 302
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified-darwin
-        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
-        rule_identifier: bsd-simplified-darwin.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified-darwin.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE
         matched_text: |
           This software is not subject to any export provision of the United States
@@ -401,34 +401,34 @@ other_license_detections:
   - license_expression: apache-2.0 AND hs-regexp
     license_expression_spdx: Apache-2.0 AND Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 306
         end_line: 309
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 47
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1021.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1021.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1021.RULE
         matched_text: |
           This software was submitted by Cisco Systems to the Apache Software Foundation in July
           1997.  Future revisions and derivatives of this source code must
           acknowledge Cisco Systems as the original contributor of this module.
           All other licensing and usage conditions are those of the Apache Software Foundation.
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 317
         end_line: 335
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 148
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp_1.RULE
         rule_relevance: 100
+        rule_identifier: hs-regexp_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_1.RULE
         matched_text: |
           This software is not subject to any license of the American Telephone and
@@ -454,17 +454,17 @@ other_license_detections:
   - license_expression: bsd-unchanged
     license_expression_spdx: LicenseRef-scancode-bsd-unchanged
     matches:
-      - score: '100.0'
+      - license_expression: bsd-unchanged
+        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
+        from_file:
         start_line: 370
         end_line: 391
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-unchanged
-        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
-        rule_identifier: bsd-unchanged_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-unchanged_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unchanged_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -493,17 +493,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 395
         end_line: 419
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_879.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -535,17 +535,17 @@ other_license_detections:
   - license_expression: bison-exception-2.2
     license_expression_spdx: Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
+        from_file:
         start_line: 422
         end_line: 433
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bison-exception-2.2
-        spdx_license_expression: Bison-exception-2.2
-        rule_identifier: bison-exception-2.2.LICENSE
         rule_relevance: 100
+        rule_identifier: bison-exception-2.2.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bison-exception-2.2.LICENSE
         matched_text: |
           As a special exception, you may create a larger work that contains
@@ -564,17 +564,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 439
         end_line: 454
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
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 1c90bf9754a..26aedb94524 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
@@ -33,30 +33,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 67
         end_line: 67
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 68
         end_line: 82
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_846.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -78,30 +78,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 84
         end_line: 84
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 85
         end_line: 96
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
         matched_text: |
           This library is free software: you can redistribute it and/or modify
@@ -116,17 +116,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this library.  If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 98
         end_line: 99
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General
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 a7495a11977..c667351a482 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
@@ -83,17 +83,17 @@ other_license_detections:
   - license_expression: autoconf-simple-exception-2.0
     license_expression_spdx: Autoconf-exception-generic
     matches:
-      - score: '100.0'
+      - license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
+        from_file:
         start_line: 109
         end_line: 112
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: autoconf-simple-exception-2.0
-        spdx_license_expression: Autoconf-exception-generic
-        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
         matched_text: |
           As a special exception to the GNU General Public License, if you
@@ -104,17 +104,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 242
         end_line: 243
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_492.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_492.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_492.RULE
         matched_text: |
           This file is in the public domain, so clarified as of 1996-06-05 by
@@ -123,17 +123,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 296
         end_line: 297
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_73.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_73.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_73.RULE
         matched_text: |
           This code is released into public domain without any warranty of any
@@ -142,34 +142,34 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 314
         end_line: 314
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_2.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_2.RULE
         matched_text: This code is released by the author with no restrictions on usage.
     identifier: other_permissive-f3b400be-ace2-fed7-d629-910346d268ab
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 333
         end_line: 334
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_357.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_357.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_357.RULE
         matched_text: |
           is distributed with no restrictions on usage or
@@ -178,17 +178,17 @@ other_license_detections:
   - license_expression: bison-exception-2.2
     license_expression_spdx: Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
+        from_file:
         start_line: 361
         end_line: 369
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 90
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bison-exception-2.2
-        spdx_license_expression: Bison-exception-2.2
-        rule_identifier: bison-exception-2.2_2.RULE
         rule_relevance: 100
+        rule_identifier: bison-exception-2.2_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bison-exception-2.2_2.RULE
         matched_text: |
           As a special exception, you may create a larger work that contains part
@@ -204,17 +204,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 407
         end_line: 408
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_303.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_303.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
         matched_text: |
           This code was written by Colin Plumb in 1993, no copyright is claimed.
@@ -223,17 +223,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '96.07'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 464
         end_line: 509
-        from_file:
+        matcher: 3-seq
+        score: '96.07'
         matched_length: 342
         match_coverage: '96.07'
-        matcher: 3-seq
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1121.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1121.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1121.RULE
         matched_text: |
           is distributed under the GNU General Public License version 2
@@ -286,17 +286,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '80.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 521
         end_line: 530
-        from_file:
+        matcher: 1-hash
+        score: '80.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_17.RULE
         rule_relevance: 80
+        rule_identifier: mit_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_17.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -313,17 +313,17 @@ other_license_detections:
   - license_expression: mit-0
     license_expression_spdx: MIT-0
     matches:
-      - score: '100.0'
+      - license_expression: mit-0
+        spdx_license_expression: MIT-0
+        from_file:
         start_line: 533
         end_line: 547
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit-0
-        spdx_license_expression: MIT-0
-        rule_identifier: mit-0_7.RULE
         rule_relevance: 100
+        rule_identifier: mit-0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-0_7.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -345,17 +345,17 @@ other_license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 550
         end_line: 558
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 96
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software and
@@ -371,17 +371,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 561
         end_line: 583
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -411,17 +411,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 586
         end_line: 608
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1015.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1015.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1015.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -451,17 +451,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 611
         end_line: 635
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 216
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_49.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_49.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_49.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -493,17 +493,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 638
         end_line: 665
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 242
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_30.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_30.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -538,17 +538,17 @@ other_license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 668
         end_line: 696
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 245
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -584,17 +584,17 @@ other_license_detections:
   - license_expression: brian-clapper
     license_expression_spdx: LicenseRef-scancode-brian-clapper
     matches:
-      - score: '68.51'
+      - license_expression: brian-clapper
+        spdx_license_expression: LicenseRef-scancode-brian-clapper
+        from_file:
         start_line: 699
         end_line: 719
-        from_file:
+        matcher: 3-seq
+        score: '68.51'
         matched_length: 124
         match_coverage: '68.51'
-        matcher: 3-seq
-        license_expression: brian-clapper
-        spdx_license_expression: LicenseRef-scancode-brian-clapper
-        rule_identifier: brian-clapper.LICENSE
         rule_relevance: 100
+        rule_identifier: brian-clapper.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/brian-clapper.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -622,17 +622,17 @@ other_license_detections:
   - license_expression: tu-berlin
     license_expression_spdx: TU-Berlin-1.0
     matches:
-      - score: '100.0'
+      - license_expression: tu-berlin
+        spdx_license_expression: TU-Berlin-1.0
+        from_file:
         start_line: 722
         end_line: 731
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 90
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: tu-berlin
-        spdx_license_expression: TU-Berlin-1.0
-        rule_identifier: tu-berlin.LICENSE
         rule_relevance: 100
+        rule_identifier: tu-berlin.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tu-berlin.LICENSE
         matched_text: |
           Any use of this software is permitted provided that this notice is not
@@ -649,17 +649,17 @@ other_license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '99.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 734
         end_line: 736
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 33
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_truncated.RULE
         rule_relevance: 99
+        rule_identifier: isc_truncated.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_truncated.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -669,17 +669,17 @@ other_license_detections:
   - license_expression: wol
     license_expression_spdx: LicenseRef-scancode-wol
     matches:
-      - score: '90.77'
+      - license_expression: wol
+        spdx_license_expression: LicenseRef-scancode-wol
+        from_file:
         start_line: 739
         end_line: 745
-        from_file:
+        matcher: 3-seq
+        score: '90.77'
         matched_length: 59
         match_coverage: '90.77'
-        matcher: 3-seq
-        license_expression: wol
-        spdx_license_expression: LicenseRef-scancode-wol
-        rule_identifier: wol.LICENSE
         rule_relevance: 100
+        rule_identifier: wol.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/wol.LICENSE
         matched_text: |
           The Wide Open License (WOL)
@@ -693,17 +693,17 @@ other_license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 749
         end_line: 750
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-free.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
         matched_text: |
           This configure script is free software; the Free Software Foundation
@@ -712,34 +712,34 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 94
         end_line: 94
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_620.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_620.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_620.RULE
         matched_text: GPL-2
     identifier: gpl_2_0-73650a7c-ed7f-7e77-df4a-654c89d9a1a6
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 89
         end_line: 91
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1333.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
         matched_text: |
           This program is free software, distributed under the terms of the GNU
@@ -749,17 +749,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 104
         end_line: 107
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_165.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -770,34 +770,34 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '80.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 145
         end_line: 145
-        from_file:
+        matcher: 1-hash
+        score: '80.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
+        rule_identifier: gpl-2.0_1153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 141
         end_line: 142
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_469.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
         matched_text: |
           distributed under the terms of the GNU
@@ -806,68 +806,68 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '80.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 168
         end_line: 168
-        from_file:
+        matcher: 1-hash
+        score: '80.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
+        rule_identifier: gpl-2.0_1153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 165
         end_line: 165
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_469.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
         matched_text: Distributed under the terms of the GNU General Public License
     identifier: gpl_1_0_plus-df8dc57b-9ffe-5d74-afd6-5514ed17578c
   - license_expression: unknown
     license_expression_spdx: LicenseRef-scancode-unknown
     matches:
-      - score: '100.0'
+      - license_expression: unknown
+        spdx_license_expression: LicenseRef-scancode-unknown
+        from_file:
         start_line: 178
         end_line: 178
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: unknown
-        spdx_license_expression: LicenseRef-scancode-unknown
-        rule_identifier: unknown_9.RULE
         rule_relevance: 100
+        rule_identifier: unknown_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_9.RULE
         matched_text: 'License: none'
     identifier: unknown-f774baab-edec-ae58-59f7-6560caa7b354
   - license_expression: free-unknown
     license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
-      - score: '100.0'
+      - license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
+        from_file:
         start_line: '194'
         end_line: '197'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 44
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        rule_identifier: free-unknown_109.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown_109.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_109.RULE
         matched_text: |
           This software is furnished under an open source license and may be used
@@ -878,34 +878,34 @@ other_license_detections:
   - license_expression: unknown
     license_expression_spdx: LicenseRef-scancode-unknown
     matches:
-      - score: '100.0'
+      - license_expression: unknown
+        spdx_license_expression: LicenseRef-scancode-unknown
+        from_file:
         start_line: 247
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: unknown
-        spdx_license_expression: LicenseRef-scancode-unknown
-        rule_identifier: unknown_9.RULE
         rule_relevance: 100
+        rule_identifier: unknown_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_9.RULE
         matched_text: 'License: none'
     identifier: unknown-f774baab-edec-ae58-59f7-6560caa7b354
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 249
         end_line: 267
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_362.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_362.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_362.RULE
         matched_text: |
           File lacks copyright and licensing, but contains the comment
@@ -931,17 +931,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 277
         end_line: 284
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 69
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_848.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_848.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_848.RULE
         matched_text: |
           Have you intended for that package to be released under a Free
@@ -956,17 +956,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 324
         end_line: 327
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -977,17 +977,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 341
         end_line: 343
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1333.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
         matched_text: |
           This program is free software, distributed under the terms of the GNU
@@ -997,17 +997,17 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 356
         end_line: 359
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_7.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -1018,51 +1018,51 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '80.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 381
         end_line: 381
-        from_file:
+        matcher: 1-hash
+        score: '80.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
+        rule_identifier: gpl-2.0_1153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 378
         end_line: 378
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_470.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_470.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_470.RULE
         matched_text: you may use this source under GPL terms!
     identifier: gpl_1_0_plus-02a5caf2-d20c-3df8-10d3-6013622398d3
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 387
         end_line: 389
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1333.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1333.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1333.RULE
         matched_text: |
           This program is free software, distributed under the terms of the GNU
@@ -1072,34 +1072,34 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '90.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 402
         end_line: 402
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_384.RULE
         rule_relevance: 90
+        rule_identifier: lgpl-2.1_384.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_384.RULE
         matched_text: Version of LGPL license not mentioned.  Assumed to be version 2.1.
     identifier: lgpl_2_1-9d65d7eb-28e6-86d4-7cd1-3511a4874ff0
   - license_expression: gpl-2.0 OR lgpl-2.0-plus
     license_expression_spdx: GPL-2.0-only OR LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 OR lgpl-2.0-plus
+        spdx_license_expression: GPL-2.0-only OR LGPL-2.0-or-later
+        from_file:
         start_line: 395
         end_line: 399
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0 OR lgpl-2.0-plus
-        spdx_license_expression: GPL-2.0-only OR LGPL-2.0-or-later
-        rule_identifier: gpl-2.0_or_lgpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_or_lgpl-2.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_lgpl-2.0-plus_1.RULE
         matched_text: |
           This program is free software, distributed under the terms of the GNU
@@ -1111,34 +1111,34 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '80.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 430
         end_line: 430
-        from_file:
+        matcher: 2-aho
+        score: '80.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
+        rule_identifier: gpl-2.0_1153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 426
         end_line: 427
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_86.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_86.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_86.RULE
         matched_text: |
           This program is free software, distributed under the terms of
@@ -1147,17 +1147,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 435
         end_line: 436
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1064.RULE
         rule_relevance: 100
+        rule_identifier: mit_1064.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1064.RULE
         matched_text: |
           Prototype is freely distributable under the terms of an MIT-style
@@ -1166,34 +1166,34 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '80.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 461
         end_line: 461
-        from_file:
+        matcher: 1-hash
+        score: '80.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1153.RULE
         rule_relevance: 80
+        rule_identifier: gpl-2.0_1153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1153.RULE
         matched_text: Version of license not mentioned.  Assumed to be version 2.
     identifier: gpl_2_0-eb0b9bcf-0157-49dd-cb2e-d511ffc33cb0
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 458
         end_line: 458
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_469.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_469.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_469.RULE
         matched_text: Distributed under the terms of the GNU General Public License
     identifier: gpl_1_0_plus-df8dc57b-9ffe-5d74-afd6-5514ed17578c
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 1ac7e7fb7ee..b96c4d4f183 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 20
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_842.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_842.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_842.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
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 a1ec86d48a4..8944678b732 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,30 +74,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 24
         end_line: 24
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 25
         end_line: 32
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 68
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_121.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -112,17 +112,17 @@ other_license_detections:
   - license_expression: gpl-2.0 AND openssl-exception-gpl-3.0-plus
     license_expression_spdx: GPL-2.0-only AND cryptsetup-OpenSSL-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 50
         end_line: 57
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 68
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_121.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -133,17 +133,17 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
           GNU General Public License for more details.
-      - score: '100.0'
+      - license_expression: openssl-exception-gpl-3.0-plus
+        spdx_license_expression: cryptsetup-OpenSSL-exception
+        from_file:
         start_line: 59
         end_line: 71
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openssl-exception-gpl-3.0-plus
-        spdx_license_expression: cryptsetup-OpenSSL-exception
-        rule_identifier: openssl-exception-gpl-3.0-plus.LICENSE
         rule_relevance: 100
+        rule_identifier: openssl-exception-gpl-3.0-plus.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openssl-exception-gpl-3.0-plus.LICENSE
         matched_text: |
           In addition, as a special exception, the copyright holders give
@@ -159,17 +159,17 @@ other_license_detections:
           do not wish to do so, delete this exception statement from your
           version.  If you delete this exception statement from all source
           files in the program, then also delete it here.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 73
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -183,17 +183,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND autoconf-simple-exception-2.0 AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND Autoconf-exception-generic AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 155
         end_line: 163
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 76
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_3.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -205,34 +205,34 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
           GNU General Public License for more details.
-      - score: '100.0'
+      - license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
+        from_file:
         start_line: 165
         end_line: 168
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: autoconf-simple-exception-2.0
-        spdx_license_expression: Autoconf-exception-generic
-        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
         matched_text: |
           As a special exception to the GNU General Public License, if you
           distribute this file as part of a program that contains a
           configuration script generated by Autoconf, you may include it under
           the same distribution terms that you use for the rest of that program.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 170
         end_line: 176
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -246,17 +246,17 @@ other_license_detections:
   - license_expression: gpl-3.0-plus WITH autoconf-simple-exception AND gpl-3.0
     license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH autoconf-simple-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
+        from_file:
         start_line: 186
         end_line: 201
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 139
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH autoconf-simple-exception
-        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
-        rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-simple-exception_2.RULE
         matched_text: |
           This file is free software; you can redistribute it and/or modify it
@@ -275,17 +275,17 @@ other_license_detections:
           the same distribution terms that you use for the rest of that
           program.  This Exception is an additional permission under section 7
           of the GNU General Public License, version 3 ("GPLv3").
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 203
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_404.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -299,17 +299,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0 AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
+        from_file:
         start_line: 217
         end_line: 230
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus WITH libtool-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
-        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_2.RULE
         matched_text: |
           GNU Libtool is free software; you can redistribute it and/or modify
@@ -326,17 +326,17 @@ other_license_detections:
           WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           General Public License for more details.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 232
         end_line: 238
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -350,17 +350,17 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus WITH libtool-exception-2.0 AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: LGPL-2.0-or-later WITH Libtool-exception
+        from_file:
         start_line: 245
         end_line: 258
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus WITH libtool-exception-2.0
-        spdx_license_expression: LGPL-2.0-or-later WITH Libtool-exception
-        rule_identifier: lgpl-2.0-plus_with_libtool-exception-2.0_4.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_with_libtool-exception-2.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_with_libtool-exception-2.0_4.RULE
         matched_text: |
           GNU Libltdl is free software; you can redistribute it and/or
@@ -377,17 +377,17 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
           GNU Lesser General Public License for more details.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 260
         end_line: 266
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 62
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_452.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_452.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_452.RULE
         matched_text: |
           You should have received a copy of the GNU Lesser General Public License
@@ -401,17 +401,17 @@ other_license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 376
         end_line: 386
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -429,17 +429,17 @@ other_license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 407
         end_line: 409
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation gives
@@ -449,17 +449,17 @@ other_license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 417
         end_line: 418
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-free.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
         matched_text: |
           This configure script is free software; the Free Software Foundation
@@ -468,17 +468,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 446
         end_line: 453
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 63
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -493,17 +493,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 460
         end_line: 463
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -514,17 +514,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 470
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-ap.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
         matched_text: |
           Copying and distribution of this file, with or without modification, are
@@ -535,17 +535,17 @@ other_license_detections:
   - license_expression: bzip2-libbzip-2010
     license_expression_spdx: bzip2-1.0.6
     matches:
-      - score: '100.0'
+      - license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
+        from_file:
         start_line: 482
         end_line: 511
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 233
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bzip2-libbzip-2010
-        spdx_license_expression: bzip2-1.0.6
-        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
+        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -582,81 +582,81 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 518
         end_line: 518
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 519
         end_line: 519
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public Domain
     identifier: public_domain-3a08f30b-d5be-6da1-ff9f-8c48b649c6c7
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 526
         end_line: 526
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_38.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
         matched_text: is public domain
     identifier: public_domain-7d49b7ad-8b9e-60cd-5fde-397e63b65786
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 533
         end_line: 533
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_45.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_45.RULE
         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
     identifier: public_domain-f03547dd-ab14-17f3-8260-38458dca67ee
   - license_expression: x11-tiff
     license_expression_spdx: libtiff
     matches:
-      - score: '100.0'
+      - license_expression: x11-tiff
+        spdx_license_expression: libtiff
+        from_file:
         start_line: 543
         end_line: 560
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 168
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-tiff
-        spdx_license_expression: libtiff
-        rule_identifier: x11-tiff.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-tiff.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-tiff.LICENSE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software and
@@ -681,30 +681,30 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 565
         end_line: 565
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_38.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
         matched_text: is public domain.
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 569
         end_line: 569
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain.
     identifier: public_domain-12719e81-b9e7-3b20-5ec2-b0cc7eebb090
@@ -712,17 +712,17 @@ other_license_detections:
     license_expression_spdx: Apache-2.0 AND (LicenseRef-scancode-free-unknown AND Apache-2.0
       WITH LicenseRef-scancode-generic-exception)
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 579
         end_line: 589
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -736,17 +736,17 @@ other_license_detections:
           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
           See the License for the specific language governing permissions and
           limitations under the License.
-      - score: '100.0'
+      - license_expression: free-unknown AND apache-2.0 WITH generic-exception
+        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
+        from_file:
         start_line: 591
         end_line: 602
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: free-unknown AND apache-2.0 WITH generic-exception
-        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
-        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         matched_text: |
           See COPYING.YARA. The GPL exception has been granted by upstream in
@@ -765,17 +765,17 @@ other_license_detections:
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2 AND gpl-3.0
     license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
+        from_file:
         start_line: 610
         end_line: 628
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 169
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH bison-exception-2.2
-        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
-        rule_identifier: gpl-3.0-plus_with_bison-exception-2.2_6.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_bison-exception-2.2_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-2.2_6.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -797,17 +797,17 @@ other_license_detections:
           special exception, which will cause the skeleton and the resulting
           Bison output files to be licensed under the GNU General Public
           License without this special exception.
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 630
         end_line: 636
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_404.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -821,30 +821,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 638
         end_line: 638
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 639
         end_line: 647
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 79
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_90.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_90.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_90.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -860,30 +860,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 649
         end_line: 649
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 650
         end_line: 657
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_302.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_302.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_302.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -898,17 +898,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 668
         end_line: 683
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 160
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1063.RULE
         rule_relevance: 100
+        rule_identifier: mit_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1063.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -931,17 +931,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 686
         end_line: 705
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_28.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_28.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -968,17 +968,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 708
         end_line: 730
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1008,17 +1008,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 733
         end_line: 747
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -1040,17 +1040,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 34
         end_line: 40
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1064,17 +1064,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 73
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1088,17 +1088,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 121
         end_line: 127
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1112,17 +1112,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 135
         end_line: 141
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1136,17 +1136,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 170
         end_line: 176
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1160,17 +1160,17 @@ other_license_detections:
   - license_expression: gpl-3.0
     license_expression_spdx: GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 203
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_404.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1184,17 +1184,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 232
         end_line: 238
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
@@ -1208,17 +1208,17 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 260
         end_line: 266
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 62
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_452.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_452.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_452.RULE
         matched_text: |
           You should have received a copy of the GNU Lesser General Public License
@@ -1232,51 +1232,51 @@ other_license_detections:
   - license_expression: x11-xconsortium AND public-domain
     license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
-      - score: '20.2'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 293
         end_line: 296
-        from_file:
+        matcher: 3-seq
+        score: '20.2'
         matched_length: 41
         match_coverage: '20.2'
-        matcher: 3-seq
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_21.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_21.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_21.RULE
         matched_text: |
           Except as contained in this notice, the name of the X Consortium shall not
           be used in advertising or otherwise to promote the sale, use or other deal-
           ings in this Software without prior written authorization from the X Consor-
           tium.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 298
         end_line: 298
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_58.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_58.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-d9561273-6993-908f-b782-aed5836bd09b
   - license_expression: free-unknown AND apache-2.0 WITH generic-exception
     license_expression_spdx: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
     matches:
-      - score: '100.0'
+      - license_expression: free-unknown AND apache-2.0 WITH generic-exception
+        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
+        from_file:
         start_line: 591
         end_line: 602
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: free-unknown AND apache-2.0 WITH generic-exception
-        spdx_license_expression: LicenseRef-scancode-free-unknown AND Apache-2.0 WITH LicenseRef-scancode-generic-exception
-        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
         matched_text: |
           See COPYING.YARA. The GPL exception has been granted by upstream in
@@ -1295,17 +1295,17 @@ other_license_detections:
   - license_expression: gpl-3.0
     license_expression_spdx: GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 630
         end_line: 636
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_404.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_404.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_404.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
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 887b8f562c6..05d2f2e4d6f 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
@@ -9,30 +9,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 24
         end_line: 24
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 25
         end_line: 32
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 68
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_121.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_121.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_121.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -47,17 +47,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 34
         end_line: 40
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1140.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1140.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1140.RULE
         matched_text: |
           You should have received a copy of the GNU General Public License
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 382bb00bfc0..54cbf84e8ea 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
@@ -42,17 +42,17 @@ other_license_detections:
   - license_expression: gary-s-brown
     license_expression_spdx: LicenseRef-scancode-gary-s-brown
     matches:
-      - score: '100.0'
+      - license_expression: gary-s-brown
+        spdx_license_expression: LicenseRef-scancode-gary-s-brown
+        from_file:
         start_line: 81
         end_line: 82
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gary-s-brown
-        spdx_license_expression: LicenseRef-scancode-gary-s-brown
-        rule_identifier: gary-s-brown.LICENSE
         rule_relevance: 100
+        rule_identifier: gary-s-brown.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gary-s-brown.LICENSE
         matched_text: |
           You may use this program, or code or tables extracted from it, as
@@ -61,30 +61,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 84
         end_line: 84
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 85
         end_line: 100
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 136
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_807.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_807.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_807.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -107,17 +107,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus WITH openssl-exception-gpl-3.0-plus
     license_expression_spdx: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 103
         end_line: 130
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 257
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: gpl-2.0-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -152,30 +152,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 132
         end_line: 132
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 133
         end_line: 149
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_293.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify it
@@ -199,17 +199,17 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus WITH openssl-exception-gpl-3.0-plus
     license_expression_spdx: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception
     matches:
-      - score: '95.0'
+      - 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
+        from_file:
         start_line: 152
         end_line: 180
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 265
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: lgpl-2.1-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_relevance: 95
+        rule_identifier: lgpl-2.1-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_openssl-exception-gpl-3.0-plus_3.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify it
@@ -245,17 +245,17 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 183
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_129.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_129.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_129.RULE
         matched_text: |
           You may use this work under the terms of a Creative Commons CC0 1.0
@@ -267,30 +267,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 189
         end_line: 189
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: '190'
         end_line: 203
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 109
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_845.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_845.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_845.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
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 0ce3413caa6..9c221265ee7 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
@@ -16,17 +16,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 26
         end_line: 48
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_70.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_70.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_70.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -56,17 +56,17 @@ other_license_detections:
   - license_expression: cups
     license_expression_spdx: LicenseRef-scancode-cups
     matches:
-      - score: '100.0'
+      - license_expression: cups
+        spdx_license_expression: LicenseRef-scancode-cups
+        from_file:
         start_line: 51
         end_line: 107
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 356
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cups
-        spdx_license_expression: LicenseRef-scancode-cups
-        rule_identifier: cups_6.RULE
         rule_relevance: 100
+        rule_identifier: cups_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cups_6.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -130,17 +130,17 @@ other_license_detections:
   - license_expression: cups
     license_expression_spdx: LicenseRef-scancode-cups
     matches:
-      - score: '100.0'
+      - license_expression: cups
+        spdx_license_expression: LicenseRef-scancode-cups
+        from_file:
         start_line: 110
         end_line: 166
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 357
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cups
-        spdx_license_expression: LicenseRef-scancode-cups
-        rule_identifier: cups_4.RULE
         rule_relevance: 100
+        rule_identifier: cups_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cups_4.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -204,30 +204,30 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 169
         end_line: 169
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_7.RULE
         rule_relevance: 100
+        rule_identifier: zlib_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_7.RULE
         matched_text: zlib License
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 171
         end_line: 188
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
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 f84389fd04b..78595651cd0 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
@@ -10,30 +10,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 10
         end_line: 10
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 11
         end_line: 16
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_754.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_754.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_754.RULE
         matched_text: |
           all software (original and derived) is covered under the GPL (version 2 or
@@ -46,30 +46,30 @@ other_license_detections:
   - license_expression: afl-2.1
     license_expression_spdx: AFL-2.1
     matches:
-      - score: '100.0'
+      - license_expression: afl-2.1
+        spdx_license_expression: AFL-2.1
+        from_file:
         start_line: 21
         end_line: 21
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: afl-2.1
-        spdx_license_expression: AFL-2.1
-        rule_identifier: afl-2.1_12.RULE
         rule_relevance: 100
+        rule_identifier: afl-2.1_12.RULE
         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
-      - score: '100.0'
+      - license_expression: afl-2.1
+        spdx_license_expression: AFL-2.1
+        from_file:
         start_line: 26
         end_line: 181
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 1411
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: afl-2.1
-        spdx_license_expression: AFL-2.1
-        rule_identifier: afl-2.1_6.RULE
         rule_relevance: 100
+        rule_identifier: afl-2.1_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afl-2.1_6.RULE
         matched_text: |
           The Academic Free License v. 2.1
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 0b76e55af86..988b2ba579d 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
@@ -161,30 +161,30 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 355
         end_line: 355
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
         matched_text: 'License: artistic'
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 356
         end_line: 360
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 43
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_13.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_13.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_13.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -196,17 +196,17 @@ other_license_detections:
   - license_expression: artistic-2.0
     license_expression_spdx: Artistic-2.0
     matches:
-      - score: '99.93'
+      - license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
+        from_file:
         start_line: 363
         end_line: 551
-        from_file:
+        matcher: 3-seq
+        score: '99.93'
         matched_length: 1353
         match_coverage: '99.93'
-        matcher: 3-seq
-        license_expression: artistic-2.0
-        spdx_license_expression: Artistic-2.0
-        rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
         matched_text: |
           Copyright (c) 2000-2006, The Perl Foundation.
@@ -402,121 +402,121 @@ other_license_detections:
   - license_expression: gpl-1.0-plus AND gpl-1.0
     license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 553
         end_line: 553
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_395.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 554
         end_line: 557
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_2.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by
           the Free Software Foundation; either version 1, or (at your option)
           any later version.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 559
         end_line: 560
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_33.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_33.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE
         matched_text: |
           the GNU General
           Public License
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 560
         end_line: 560
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_424.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_424.RULE
         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-
-      - score: '60.0'
+      - license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
+        from_file:
         start_line: 560
         end_line: 560
-        from_file:
+        matcher: 2-aho
+        score: '60.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0
-        spdx_license_expression: GPL-1.0-only
-        rule_identifier: gpl-1.0_15.RULE
         rule_relevance: 60
+        rule_identifier: gpl-1.0_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_15.RULE
         matched_text: GPL-1'
     identifier: gpl_1_0_plus_and_gpl_1_0-40cd1f34-7ef5-dd7b-2ab9-7f0a899d139c
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 562
         end_line: 562
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 563
         end_line: 565
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 31
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_396.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_396.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_396.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by
           the Free Software Foundation; version 2.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 567
         end_line: 568
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1295.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1295.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1295.RULE
         matched_text: |
           On Debian systems, the complete text of version 2 of the GNU General
@@ -525,47 +525,47 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 570
         end_line: 570
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 571
         end_line: 574
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_165.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by
           the Free Software Foundation; either version 2, or (at your option)
           any later version.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 576
         end_line: 577
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1295.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1295.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1295.RULE
         matched_text: |
           On Debian systems, the complete text of version 2 of the GNU General
@@ -574,140 +574,140 @@ other_license_detections:
   - license_expression: gpl-3.0 AND gpl-1.0-plus
     license_expression_spdx: GPL-3.0-only AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 579
         end_line: 579
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_rdesc_1.RULE
         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'
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 580
         end_line: 582
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl_91.RULE
         rule_relevance: 100
+        rule_identifier: gpl_91.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_91.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by
           the Free Software Foundation;
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 584
         end_line: 585
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_237.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_237.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_237.RULE
         matched_text: |
           version 3 of the GNU General
           Public License
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 585
         end_line: 585
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_93.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
         matched_text: usr/share/common-licenses/GPL-3'
     identifier: gpl_3_0_and_gpl_1_0_plus-9c11f207-d3a8-a6a3-d2a6-46552a959726
   - license_expression: gpl-3.0-plus AND gpl-3.0
     license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 587
         end_line: 587
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 588
         end_line: 591
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_284.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_284.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_284.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
           it under the terms of the GNU General Public License as published by
           the Free Software Foundation; either version 3, or (at your option)
           any later version.
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 593
         end_line: 594
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_237.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_237.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_237.RULE
         matched_text: |
           version 3 of the GNU General
           Public License
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 594
         end_line: 594
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_93.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
         matched_text: usr/share/common-licenses/GPL-3'
     identifier: gpl_3_0_plus_and_gpl_3_0-3e5fdf20-1437-7ca2-c0cd-475f7307fbbb
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 597
         end_line: 607
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc.LICENSE
         rule_relevance: 100
+        rule_identifier: isc.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for any
@@ -725,17 +725,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 610
         end_line: 612
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 33
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_16.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_16.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all copyright
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 ed9d67729bb..148d608e8a5 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
@@ -21,17 +21,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '90.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 47
         end_line: 59
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: 101
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1036.RULE
         rule_relevance: 90
+        rule_identifier: bsd-new_1036.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1036.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -51,17 +51,17 @@ other_license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 62
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -79,17 +79,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 75
         end_line: 94
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 a0a4f53dee8..179982b24b1 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
@@ -47,17 +47,17 @@ other_license_detections:
   - license_expression: beerware
     license_expression_spdx: Beerware
     matches:
-      - score: '100.0'
+      - license_expression: beerware
+        spdx_license_expression: Beerware
+        from_file:
         start_line: 32
         end_line: 35
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 52
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: beerware
-        spdx_license_expression: Beerware
-        rule_identifier: beerware_1.RULE
         rule_relevance: 100
+        rule_identifier: beerware_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/beerware_1.RULE
         matched_text: |
           THE BEER-WARE LICENSE" (Revision 42):
@@ -68,17 +68,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 46
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_45.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_45.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE
         matched_text: |
           placed in the
@@ -87,17 +87,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 121
         end_line: 137
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -121,30 +121,30 @@ other_license_detections:
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 139
         end_line: 139
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 140
         end_line: 152
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 117
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_239.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_239.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_239.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -160,60 +160,60 @@ other_license_detections:
           You should have received a copy of the GNU Lesser General Public
           License along with this library; if not, write to the Free Software
           Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 154
         end_line: 154
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_83_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_83_1.RULE
         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
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 155
         end_line: 155
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_82.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_82.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_82.RULE
         matched_text: usr/share/common-licenses/LGPL-2.1.
     identifier: lgpl_2_1_and_lgpl_2_1_plus-590ac42f-f1ba-031e-45bf-938f9dd5041a
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 157
         end_line: 157
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 158
         end_line: 171
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 109
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_951.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_951.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_951.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -234,17 +234,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 176
         end_line: '198'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -274,17 +274,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 201
         end_line: 220
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -311,30 +311,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 222
         end_line: 222
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 223
         end_line: 235
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_420.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_420.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -350,47 +350,47 @@ other_license_detections:
           You should have received a copy of the GNU General Public License along
           with this program; if not, write to the Free Software Foundation, Inc.,
           51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 237
         end_line: 237
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_660.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_660.RULE
         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
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 238
         end_line: 238
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_621.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_621.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_621.RULE
         matched_text: usr/share/common-licenses/GPL-2.
     identifier: gpl_2_0_plus_and_gpl_2_0-b1883257-dfa5-afb6-71d5-85fe839662ba
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 241
         end_line: 273
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 300
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_35.RULE
         rule_relevance: 100
+        rule_identifier: unicode_35.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_35.RULE
         matched_text: |
           Distributed under the
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 eb62cc3e07a..c2ca76deed4 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
@@ -28,30 +28,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 66
         end_line: 66
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 67
         end_line: 68
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
@@ -60,17 +60,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 71
         end_line: 77
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_1040.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_1040.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1040.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -84,30 +84,30 @@ other_license_detections:
   - license_expression: gpl-3.0
     license_expression_spdx: GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 79
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_rdesc_1.RULE
         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'
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 80
         end_line: 81
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_394.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_394.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_394.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
@@ -116,30 +116,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 83
         end_line: 83
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 84
         end_line: 85
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_307.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_307.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_307.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Library General Public
@@ -148,17 +148,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 88
         end_line: 111
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -189,17 +189,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 114
         end_line: 138
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 dd8da3c19f6..6517e12a768 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
     license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
-      - score: '99.02'
+      - 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
+        from_file:
         start_line: 17
         end_line: 30
-        from_file:
+        matcher: 3-seq
+        score: '99.02'
         matched_length: 101
         match_coverage: '99.02'
-        matcher: 3-seq
-        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
-        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         matched_text: "This package, the EXT2 filesystem utilities, are made available under\n\
           the GNU General Public License version 2, with the exception of the\nlib/ext2fs and\
@@ -34,17 +34,17 @@ license_detections:
   - license_expression: ntp-0 AND bsd-new
     license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: ntp-0
+        spdx_license_expression: NTP-0
+        from_file:
         start_line: 38
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ntp-0
-        spdx_license_expression: NTP-0
-        rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
+        rule_identifier: ntp-0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -55,17 +55,17 @@ license_detections:
              M.I.T. S.I.P.B. make no representations about the suitability of
              this software for any purpose.  It is provided "as is" without
              express or implied warranty.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 49
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 e7646233a17..75f46eb8ff0 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 18
         end_line: '19'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1137.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1137.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1137.RULE
         matched_text: |
           This package, the EXT2 filesystem utilities, is protected by the GNU
@@ -26,17 +26,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 24
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_563.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_563.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_563.RULE
         matched_text: |
           On Debian GNU systems, the complete text of the GNU General
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 e7646233a17..75f46eb8ff0 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 18
         end_line: '19'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1137.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1137.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1137.RULE
         matched_text: |
           This package, the EXT2 filesystem utilities, is protected by the GNU
@@ -26,17 +26,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 24
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_563.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_563.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_563.RULE
         matched_text: |
           On Debian GNU systems, the complete text of the GNU General
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 f385b9ccb0c..a1710dca4bc 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: lgpl-2.0
     license_expression_spdx: LGPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
+        from_file:
         start_line: 15
         end_line: '19'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0
-        spdx_license_expression: LGPL-2.0-only
-        rule_identifier: lgpl-2.0_24.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_24.RULE
         matched_text: |
           You are free to distribute this software under the terms of the GNU
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 5f68ea38e23..cfba6a19b84 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 14
         end_line: 24
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
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 9b432b2a096..820a1963ad7 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 15
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
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 1ef333821f2..0abd2d898b1 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 14
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 1ef333821f2..0abd2d898b1 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 14
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 9e43055a0a3..04d88023fb1 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 15
         end_line: 39
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 36323758442..a8a6bb1aabe 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
@@ -20,30 +20,30 @@ other_license_detections:
   - license_expression: mpl-2.0
     license_expression_spdx: MPL-2.0
     matches:
-      - score: '100.0'
+      - license_expression: mpl-2.0
+        spdx_license_expression: MPL-2.0
+        from_file:
         start_line: 38
         end_line: 38
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mpl-2.0
-        spdx_license_expression: MPL-2.0
-        rule_identifier: mpl-2.0_75.RULE
         rule_relevance: 100
+        rule_identifier: mpl-2.0_75.RULE
         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'
-      - score: '100.0'
+      - license_expression: mpl-2.0
+        spdx_license_expression: MPL-2.0
+        from_file:
         start_line: 39
         end_line: 411
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2371
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mpl-2.0
-        spdx_license_expression: MPL-2.0
-        rule_identifier: mpl-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: mpl-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mpl-2.0.LICENSE
         matched_text: |
           Mozilla Public License Version 2.0
@@ -423,17 +423,17 @@ other_license_detections:
   - license_expression: bsd-2-clause-views
     license_expression_spdx: BSD-2-Clause-Views
     matches:
-      - score: '100.0'
+      - license_expression: bsd-2-clause-views
+        spdx_license_expression: BSD-2-Clause-Views
+        from_file:
         start_line: 414
         end_line: 441
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-2-clause-views
-        spdx_license_expression: BSD-2-Clause-Views
-        rule_identifier: bsd-2-clause-views_1.RULE
         rule_relevance: 100
+        rule_identifier: bsd-2-clause-views_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-2-clause-views_1.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -468,17 +468,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.04'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 446
         end_line: 470
-        from_file:
+        matcher: 3-seq
+        score: '99.04'
         matched_length: 207
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_784.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_784.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_784.RULE
         matched_text: |
           Redistribution  and  use  in  source   and  binary  forms,  with  or  without
@@ -510,30 +510,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 472
         end_line: 472
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 473
         end_line: 481
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_99.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_99.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_99.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all copyright
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 e59da558721..5f175197b9c 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
@@ -36,30 +36,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 93
         end_line: 93
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 94
         end_line: 107
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 107
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_949.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_949.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_949.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -80,30 +80,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 109
         end_line: 109
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 110
         end_line: 124
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_839.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -125,30 +125,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 126
         end_line: 126
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 127
         end_line: 141
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_385.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_385.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_385.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -170,30 +170,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 143
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 144
         end_line: 155
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_457.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_457.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_457.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -212,30 +212,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 157
         end_line: 157
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 158
         end_line: 179
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_186.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_186.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_186.RULE
         matched_text: |
           Certain owners wish to permanently relinquish those rights to a Work for
@@ -264,17 +264,17 @@ other_license_detections:
   - license_expression: cc-by-sa-3.0
     license_expression_spdx: CC-BY-SA-3.0
     matches:
-      - score: '97.8'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: 182
         end_line: 488
-        from_file:
+        matcher: 3-seq
+        score: '97.8'
         matched_length: 3074
         match_coverage: '97.8'
-        matcher: 3-seq
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_35.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_35.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_35.RULE
         matched_text: |
           THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
@@ -588,30 +588,30 @@ other_license_detections:
   - license_expression: cc-by-sa-4.0
     license_expression_spdx: CC-BY-SA-4.0
     matches:
-      - score: '100.0'
+      - license_expression: cc-by-sa-4.0
+        spdx_license_expression: CC-BY-SA-4.0
+        from_file:
         start_line: 491
         end_line: 491
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-sa-4.0
-        spdx_license_expression: CC-BY-SA-4.0
-        rule_identifier: cc-by-sa-4.0_36.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-4.0_36.RULE
         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/
-      - score: '99.82'
+      - license_expression: cc-by-sa-4.0
+        spdx_license_expression: CC-BY-SA-4.0
+        from_file:
         start_line: 493
         end_line: 914
-        from_file:
+        matcher: 3-seq
+        score: '99.82'
         matched_length: 2766
         match_coverage: '99.82'
-        matcher: 3-seq
-        license_expression: cc-by-sa-4.0
-        spdx_license_expression: CC-BY-SA-4.0
-        rule_identifier: cc-by-sa-4.0.LICENSE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-4.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/cc-by-sa-4.0.LICENSE
         matched_text: |
           Creative Commons Corporation ("Creative Commons") is not a law firm and
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 2f22181fcb2..20862decf6e 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
@@ -11,30 +11,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 14
         end_line: 14
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 15
         end_line: 28
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 109
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_845.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_845.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_845.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
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 b626046bae2..523f93cd2ba 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
@@ -17,17 +17,17 @@ other_license_detections:
   - license_expression: mit-xfig
     license_expression_spdx: Xfig
     matches:
-      - score: '100.0'
+      - license_expression: mit-xfig
+        spdx_license_expression: Xfig
+        from_file:
         start_line: 28
         end_line: 35
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit-xfig
-        spdx_license_expression: Xfig
-        rule_identifier: mit-xfig_3.RULE
         rule_relevance: 100
+        rule_identifier: mit-xfig_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-xfig_3.RULE
         matched_text: |
           Any party obtaining a copy of these files is granted, free of charge, a
@@ -42,30 +42,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)
     license_expression_spdx: GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 53
         end_line: 53
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0 OR gpl-3.0
+        spdx_license_expression: GPL-2.0-only OR GPL-3.0-only
+        from_file:
         start_line: 54
         end_line: 69
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 130
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0 OR gpl-3.0
-        spdx_license_expression: GPL-2.0-only OR GPL-3.0-only
-        rule_identifier: gpl-2.0_or_gpl-3.0_19.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_or_gpl-3.0_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_gpl-3.0_19.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -88,17 +88,17 @@ other_license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 75
         end_line: 83
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 96
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software and its
@@ -114,30 +114,30 @@ other_license_detections:
   - license_expression: gpl-3.0 AND gpl-3.0-plus
     license_expression_spdx: GPL-3.0-only AND GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 88
         end_line: 88
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_rdesc_1.RULE
         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'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 89
         end_line: 97
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 79
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_96.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_96.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_96.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -149,17 +149,17 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
           GNU General Public License for more details.
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 99
         end_line: 101
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_405.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_405.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_405.RULE
         matched_text: |
           On Debian systems, the full text of the GNU General Public
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 c346eec7aa6..8afc71498f7 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
@@ -32,30 +32,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 69
         end_line: 69
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 70
         end_line: 83
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 114
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1149.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1149.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1149.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -76,30 +76,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 85
         end_line: 85
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 86
         end_line: 94
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -111,47 +111,47 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           Lesser General Public License for more details.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 96
         end_line: 96
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_215.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_215.RULE
         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
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 97
         end_line: 97
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_82.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_82.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_82.RULE
         matched_text: usr/share/common-licenses/LGPL-2.1'.
     identifier: lgpl_2_1_plus_and_lgpl_2_0_plus_and_lgpl_2_1-2059e657-b017-b289-bd23-348b4f78bc71
   - license_expression: boost-1.0
     license_expression_spdx: BSL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
+        from_file:
         start_line: 100
         end_line: 122
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: boost-1.0
-        spdx_license_expression: BSL-1.0
-        rule_identifier: boost-1.0.LICENSE
         rule_relevance: 100
+        rule_identifier: boost-1.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/boost-1.0.LICENSE
         matched_text: |
           Boost Software License - Version 1.0 - August 17th, 2003
@@ -181,17 +181,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 125
         end_line: 139
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 101
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1073.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1073.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1073.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -213,30 +213,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 141
         end_line: 141
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 142
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1020.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1020.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1020.RULE
         matched_text: |
           On Debian systems the complete license text of the Apache license version 2.0
@@ -245,17 +245,17 @@ other_license_detections:
   - license_expression: cc-by-sa-3.0
     license_expression_spdx: CC-BY-SA-3.0
     matches:
-      - score: '99.82'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: 146
         end_line: 521
-        from_file:
+        matcher: 3-seq
+        score: '99.82'
         matched_length: 3348
         match_coverage: '99.82'
-        matcher: 3-seq
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_41.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_41.RULE
         matched_text: |
           Creative Commons Attribution-ShareAlike 3.0 Unported
@@ -638,17 +638,17 @@ other_license_detections:
   - license_expression: bitstream
     license_expression_spdx: Bitstream-Vera
     matches:
-      - score: '100.0'
+      - license_expression: bitstream
+        spdx_license_expression: Bitstream-Vera
+        from_file:
         start_line: 524
         end_line: 566
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 364
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bitstream
-        spdx_license_expression: Bitstream-Vera
-        rule_identifier: bitstream_11.RULE
         rule_relevance: 100
+        rule_identifier: bitstream_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bitstream_11.RULE
         matched_text: |
           Bitstream Vera is
@@ -694,17 +694,17 @@ other_license_detections:
           without prior written authorization from the Gnome Foundation or Bitstream
           Inc., respectively. For further information, contact: fonts at gnome dot
           org.
-      - score: '99.0'
+      - license_expression: bitstream
+        spdx_license_expression: Bitstream-Vera
+        from_file:
         start_line: 573
         end_line: 614
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 349
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bitstream
-        spdx_license_expression: Bitstream-Vera
-        rule_identifier: bitstream_9.RULE
         rule_relevance: 99
+        rule_identifier: bitstream_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bitstream_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -753,33 +753,33 @@ other_license_detections:
   - license_expression: cc-by-sa-3.0 AND gpl-2.0
     license_expression_spdx: CC-BY-SA-3.0 AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: '19'
         end_line: 21
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_85.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_85.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_85.RULE
         matched_text: |
           Artistic or creative content is licensed under the Creative Commons
           Attribution-Share Alike 3.0 Unported license.
           (http://creativecommons.org/licenses/by-sa/3.0/)
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 26
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_822.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_822.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_822.RULE
         matched_text: |
           licensed
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 32f20953af5..986f3f1eb7d 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
@@ -19,30 +19,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 34
         end_line: 34
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 35
         end_line: 45
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 91
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_655.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_655.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_655.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -60,30 +60,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 48
         end_line: 58
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 94
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_202.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_202.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_202.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify
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 b48ae5e4968..0c3867df9b7 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
@@ -73,30 +73,30 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 1523
         end_line: 1523
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 1524
         end_line: 1539
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 136
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_1038.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_1038.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -119,30 +119,30 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1541
         end_line: 1541
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1542
         end_line: 1557
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 136
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_512.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_512.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -165,30 +165,30 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1559
         end_line: 1559
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1560
         end_line: 1577
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 146
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_418.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_418.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -213,17 +213,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 1580
         end_line: 1596
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -247,17 +247,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1599
         end_line: 1621
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_577.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_577.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -287,17 +287,17 @@ license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 1624
         end_line: 1649
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 236
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_71.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_71.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -330,30 +330,30 @@ license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 1651
         end_line: 1651
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 1652
         end_line: 1663
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_189.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -372,17 +372,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1666
         end_line: 1669
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_325.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_325.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE
         matched_text: |
           This file is in the public domain.  You may use and modify it as
@@ -393,34 +393,34 @@ license_detections:
   - license_expression: free-unknown
     license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
-      - score: '100.0'
+      - license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
+        from_file:
         start_line: 413
         end_line: 413
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        rule_identifier: free-unknown-package_2.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown-package_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE
         matched_text: This file is distributed under the same license as the PACKAGE package.
     identifier: free_unknown-6489a264-9d51-ad5f-94b9-6939d54b4036
   - license_expression: free-unknown
     license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
-      - score: '91.67'
+      - license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
+        from_file:
         start_line: 562
         end_line: 562
-        from_file:
+        matcher: 1-hash
+        score: '91.67'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        rule_identifier: free-unknown-package_1.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown-package_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE
         matched_text: This file is distributed under the same license as the fusiondirectory
           package.
@@ -428,17 +428,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 1099
         end_line: 1099
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_67.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_67.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE
         matched_text: GPL-2+).
     identifier: gpl_2_0_plus-fed2dc38-09ac-103e-1b86-4a4f5c00614a
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 2366d751545..7379bbfbf26 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
@@ -91,17 +91,17 @@ license_detections:
   - license_expression: agpl-3.0 WITH ps-or-pdf-font-exception-20170817
     license_expression_spdx: AGPL-3.0-only WITH PS-or-PDF-font-exception-20170817
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 173
         end_line: 178
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: agpl-3.0_with_ps-or-pdf-font-exception-20170817_4.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0_with_ps-or-pdf-font-exception-20170817_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_with_ps-or-pdf-font-exception-20170817_4.RULE
         matched_text: |
           As a special exception,
@@ -114,17 +114,17 @@ license_detections:
   - license_expression: sunsoft
     license_expression_spdx: LicenseRef-scancode-sunsoft
     matches:
-      - score: '95.0'
+      - license_expression: sunsoft
+        spdx_license_expression: LicenseRef-scancode-sunsoft
+        from_file:
         start_line: 294
         end_line: 298
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 36
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: sunsoft
-        spdx_license_expression: LicenseRef-scancode-sunsoft
-        rule_identifier: sunsoft_3.RULE
         rule_relevance: 95
+        rule_identifier: sunsoft_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sunsoft_3.RULE
         matched_text: |
           Except as contained in this notice,
@@ -136,17 +136,17 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 309
         end_line: 313
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_383.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_383.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_383.RULE
         matched_text: |
           This file, unlike the rest of Ghostscript,
@@ -158,17 +158,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 448
         end_line: 451
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_358.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_358.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_358.RULE
         matched_text: |
           This file may be freely distributed
@@ -179,34 +179,34 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 497
         end_line: 497
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl_72.RULE
         rule_relevance: 100
+        rule_identifier: gpl_72.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
         matched_text: 'License: gpl'
     identifier: gpl_1_0_plus-0f8d8911-0b73-cb68-4903-af37c6fa7204
   - license_expression: agpl-3.0
     license_expression_spdx: AGPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
+        from_file:
         start_line: 501
         end_line: 1350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 5386
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: agpl-3.0
-        spdx_license_expression: AGPL-3.0-only
-        rule_identifier: agpl-3.0.SPDX.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0.SPDX.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0.SPDX.RULE
         matched_text: |
           GNU AFFERO GENERAL PUBLIC LICENSE
@@ -1063,17 +1063,17 @@ license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 1371
         end_line: 1373
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-free.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
         matched_text: |
           This configure script is free software;
@@ -1083,17 +1083,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 1376
         end_line: 1398
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge,
@@ -1123,17 +1123,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 1401
         end_line: 1423
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 162
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1062.RULE
         rule_relevance: 100
+        rule_identifier: mit_1062.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1062.RULE
         matched_text: |
           Permission is hereby granted, free of charge,
@@ -1163,17 +1163,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1426
         end_line: 1442
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_ghostgum.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_ghostgum.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_ghostgum.RULE
         matched_text: |
           Permission is hereby granted, free of charge,
@@ -1197,17 +1197,17 @@ license_detections:
   - license_expression: x11-opengroup
     license_expression_spdx: MIT-open-group
     matches:
-      - score: '99.0'
+      - license_expression: x11-opengroup
+        spdx_license_expression: MIT-open-group
+        from_file:
         start_line: 1445
         end_line: 1464
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-opengroup
-        spdx_license_expression: MIT-open-group
-        rule_identifier: x11-opengroup_7.RULE
         rule_relevance: 99
+        rule_identifier: x11-opengroup_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-opengroup_7.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell
@@ -1234,17 +1234,17 @@ license_detections:
   - license_expression: ghostpdl-permissive
     license_expression_spdx: LicenseRef-scancode-ghostpdl-permissive
     matches:
-      - score: '100.0'
+      - license_expression: ghostpdl-permissive
+        spdx_license_expression: LicenseRef-scancode-ghostpdl-permissive
+        from_file:
         start_line: 1467
         end_line: 1471
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: ghostpdl-permissive
-        spdx_license_expression: LicenseRef-scancode-ghostpdl-permissive
-        rule_identifier: ghostpdl-permissive.LICENSE
         rule_relevance: 100
+        rule_identifier: ghostpdl-permissive.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ghostpdl-permissive.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute
@@ -1256,17 +1256,17 @@ license_detections:
   - license_expression: x11-lucent-variant
     license_expression_spdx: LicenseRef-scancode-x11-lucent-variant
     matches:
-      - score: '100.0'
+      - license_expression: x11-lucent-variant
+        spdx_license_expression: LicenseRef-scancode-x11-lucent-variant
+        from_file:
         start_line: 1474
         end_line: 1485
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-lucent-variant
-        spdx_license_expression: LicenseRef-scancode-x11-lucent-variant
-        rule_identifier: x11-lucent-variant.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-lucent-variant.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-lucent-variant.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
@@ -1285,17 +1285,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1488
         end_line: 1519
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms,
@@ -1334,17 +1334,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1522
         end_line: 1558
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_686.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_686.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_686.RULE
         matched_text: |
           Redistribution and use in source and binary forms,
@@ -1388,17 +1388,17 @@ license_detections:
   - license_expression: freetype
     license_expression_spdx: FTL
     matches:
-      - score: '100.0'
+      - license_expression: freetype
+        spdx_license_expression: FTL
+        from_file:
         start_line: 1561
         end_line: 1740
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 929
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: freetype
-        spdx_license_expression: FTL
-        rule_identifier: freetype_13.RULE
         rule_relevance: 100
+        rule_identifier: freetype_13.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freetype_13.RULE
         matched_text: |
           The FreeType Project LICENSE
@@ -1585,17 +1585,17 @@ license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 1743
         end_line: 1762
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is',
@@ -1622,17 +1622,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1765
         end_line: 1779
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
@@ -1654,47 +1654,47 @@ license_detections:
   - license_expression: agpl-3.0 AND agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
+        from_file:
         start_line: 73
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0
-        spdx_license_expression: AGPL-3.0-only
-        rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0_191.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
         matched_text: 'License: agpl-'
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 73
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 68
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 44
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_247.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_247.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_247.RULE
         matched_text: |
           GhostPDL and GPL Ghostscript are free software;
@@ -1706,64 +1706,64 @@ license_detections:
   - license_expression: agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-or-later
     matches:
-      - score: '90.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 76
         end_line: 76
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_143.RULE
         rule_relevance: 90
+        rule_identifier: agpl-3.0-plus_143.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_143.RULE
         matched_text: GPL Ghostscript,
     identifier: agpl_3_0_plus-02164878-d830-a722-7cb5-b3f8e9c993e7
   - license_expression: agpl-3.0 AND agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
+        from_file:
         start_line: 91
         end_line: 91
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0
-        spdx_license_expression: AGPL-3.0-only
-        rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0_191.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
         matched_text: 'License: agpl-'
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 91
         end_line: 91
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 86
         end_line: 90
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_244.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_244.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_244.RULE
         matched_text: |
           GPL Ghostscript is free software;
@@ -1775,17 +1775,17 @@ license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 96
         end_line: 98
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_311.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_311.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_311.RULE
         matched_text: |
           is free software and can be used
@@ -1795,17 +1795,17 @@ license_detections:
   - license_expression: freetype
     license_expression_spdx: FTL
     matches:
-      - score: '100.0'
+      - license_expression: freetype
+        spdx_license_expression: FTL
+        from_file:
         start_line: 121
         end_line: 126
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 49
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: freetype
-        spdx_license_expression: FTL
-        rule_identifier: freetype_4.RULE
         rule_relevance: 100
+        rule_identifier: freetype_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freetype_4.RULE
         matched_text: |
           This file is part of the FreeType project,
@@ -1818,17 +1818,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 135
         end_line: 142
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_464.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_464.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_464.RULE
         matched_text: |
           Everyone is granted permission
@@ -1843,17 +1843,17 @@ license_detections:
   - license_expression: ghostscript-1988
     license_expression_spdx: LicenseRef-scancode-ghostscript-1988
     matches:
-      - score: '100.0'
+      - license_expression: ghostscript-1988
+        spdx_license_expression: LicenseRef-scancode-ghostscript-1988
+        from_file:
         start_line: 151
         end_line: 158
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: ghostscript-1988
-        spdx_license_expression: LicenseRef-scancode-ghostscript-1988
-        rule_identifier: ghostscript-1988_4.RULE
         rule_relevance: 100
+        rule_identifier: ghostscript-1988_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ghostscript-1988_4.RULE
         matched_text: |
           Everyone is granted permission
@@ -1868,17 +1868,17 @@ license_detections:
   - license_expression: agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 167
         end_line: 171
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_244.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_244.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_244.RULE
         matched_text: |
           GPL Ghostscript is free software;
@@ -1890,17 +1890,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 183
         end_line: '190'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_463.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
         matched_text: |
           Everyone is granted permission
@@ -1915,17 +1915,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 201
         end_line: 208
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_463.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
         matched_text: |
           Everyone is granted permission
@@ -1940,17 +1940,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 225
         end_line: 234
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 69
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_537.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_537.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_537.RULE
         matched_text: |
           Everyone is granted permission
@@ -1967,34 +1967,34 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 236
         end_line: 236
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_292.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_292.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_292.RULE
         matched_text: This code is subject to the GNU General Public License
     identifier: gpl_1_0_plus-ba33abc1-a637-7834-15a3-a0081ce8d62b
   - license_expression: gpl-1.0-plus OR cups
     license_expression_spdx: GPL-1.0-or-later OR LicenseRef-scancode-cups
     matches:
-      - score: '99.0'
+      - license_expression: gpl-1.0-plus OR cups
+        spdx_license_expression: GPL-1.0-or-later OR LicenseRef-scancode-cups
+        from_file:
         start_line: 243
         end_line: 251
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 74
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR cups
-        spdx_license_expression: GPL-1.0-or-later OR LicenseRef-scancode-cups
-        rule_identifier: gpl-1.0-plus_or_cups_1.RULE
         rule_relevance: 99
+        rule_identifier: gpl-1.0-plus_or_cups_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_cups_1.RULE
         matched_text: |
           Distribution and use rights are outlined in the file "LICENSE.txt"
@@ -2010,17 +2010,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 262
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_1037.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_1037.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1037.RULE
         matched_text: |
           This program may be distributed and/or modified
@@ -2031,17 +2031,17 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 320
         end_line: 329
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 72
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_924.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_924.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_924.RULE
         matched_text: |
           Licensed to the Apache Software Foundation (ASF)
@@ -2058,17 +2058,17 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 338
         end_line: 341
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_712.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_712.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_712.RULE
         matched_text: |
           Licensed under the Apache License,
@@ -2079,64 +2079,64 @@ license_detections:
   - license_expression: agpl-3.0 AND agpl-3.0-plus
     license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: agpl-3.0
+        spdx_license_expression: AGPL-3.0-only
+        from_file:
         start_line: 352
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0
-        spdx_license_expression: AGPL-3.0-only
-        rule_identifier: agpl-3.0_191.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0_191.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE
         matched_text: 'License: agpl-'
-      - score: '100.0'
+      - license_expression: agpl-3.0-plus
+        spdx_license_expression: AGPL-3.0-or-later
+        from_file:
         start_line: 352
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: agpl-3.0-plus
-        spdx_license_expression: AGPL-3.0-or-later
-        rule_identifier: agpl-3.0-plus_28.RULE
         rule_relevance: 100
+        rule_identifier: agpl-3.0-plus_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0-plus_28.RULE
         matched_text: agpl-3+
     identifier: agpl_3_0_and_agpl_3_0_plus-7568fcdd-6845-c873-3c58-56d8665789bf
   - license_expression: afpl-9.0
     license_expression_spdx: LicenseRef-scancode-afpl-9.0
     matches:
-      - score: '90.0'
+      - license_expression: afpl-9.0
+        spdx_license_expression: LicenseRef-scancode-afpl-9.0
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: afpl-9.0
-        spdx_license_expression: LicenseRef-scancode-afpl-9.0
-        rule_identifier: afpl-9.0_9.RULE
         rule_relevance: 90
+        rule_identifier: afpl-9.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afpl-9.0_9.RULE
         matched_text: AFPL Ghostscript,
     identifier: afpl_9_0-abf2c1de-3f64-cc21-be49-583ff4b55f69
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 363
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_165.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_165.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_165.RULE
         matched_text: |
           This program is free software;
@@ -2148,17 +2148,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 375
         end_line: 379
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software;
@@ -2170,17 +2170,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 390
         end_line: 394
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software;
@@ -2192,17 +2192,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 402
         end_line: 406
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software;
@@ -2214,17 +2214,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 412
         end_line: 416
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software;
@@ -2236,17 +2236,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 422
         end_line: 426
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_64.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_64.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_64.RULE
         matched_text: |
           This program is free software;
@@ -2258,17 +2258,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 458
         end_line: 465
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_463.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_463.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_463.RULE
         matched_text: |
           Everyone is granted permission
@@ -2283,17 +2283,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 488
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_284.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_284.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_284.RULE
         matched_text: |
           This program is free software;
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 51b3f71da77..0dae2062c9a 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 45
         end_line: 60
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_18.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_18.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_18.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -42,67 +42,67 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 66
         end_line: 66
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
     identifier: mit-1f9f2ae8-7020-0a13-7934-461c752929a4
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 74
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
     identifier: gpl_2_0_plus-53a26be2-1f88-01ec-d294-921768a513c9
   - license_expression: apache-2.0 AND mit AND gpl-2.0-plus
     license_expression_spdx: Apache-2.0 AND MIT AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 80
         end_line: 82
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1214.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1214.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1214.RULE
         matched_text: |
           License: Apache-2.0
 
           License:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 82
         end_line: 96
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 108
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1035.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1035.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1035.RULE
         matched_text: |
           License: Apache-2.0
@@ -120,30 +120,30 @@ license_detections:
            .
            On Debian systems, a copy of the Apache license is available in
            .
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 98
         end_line: 98
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 99
         end_line: 115
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -163,30 +163,30 @@ license_detections:
            LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
            OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
            SOFTWARE.
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 117
         end_line: 117
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 118
         end_line: 129
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_124.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_124.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_124.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 067f6a130cb..c955f65681a 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
@@ -17,30 +17,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 27
         end_line: 27
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 28
         end_line: 42
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_839.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -62,30 +62,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 44
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 45
         end_line: 59
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 129
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_416.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
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 ea97d06a8b4..0f86507e5c3 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
@@ -19,30 +19,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 105
         end_line: 105
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 106
         end_line: 114
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 79
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_90.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_90.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_90.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -54,17 +54,17 @@ other_license_detections:
            but WITHOUT ANY WARRANTY; without even the implied warranty of
            MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
            GNU General Public License for more details.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 116
         end_line: 117
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1092.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1092.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1092.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
@@ -73,17 +73,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 120
         end_line: 136
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -107,30 +107,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 138
         end_line: 138
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 139
         end_line: 147
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 81
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_530.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_530.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_530.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -142,17 +142,17 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           Lesser General Public License for more details.
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 149
         end_line: 150
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_385.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_385.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_385.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General
@@ -161,30 +161,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 152
         end_line: 152
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 153
         end_line: 161
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -196,17 +196,17 @@ other_license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           Lesser General Public License for more details.
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 163
         end_line: 164
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_385.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_385.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_385.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General
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 8738b547f2d..7a3f286aaf5 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
@@ -40,17 +40,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.05'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 85
         end_line: 110
-        from_file:
+        matcher: 1-hash
+        score: '99.05'
         matched_length: 209
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_594.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_594.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_594.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -83,17 +83,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 114
         end_line: 121
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -108,17 +108,17 @@ other_license_detections:
   - license_expression: ietf
     license_expression_spdx: LicenseRef-scancode-ietf
     matches:
-      - score: '90.0'
+      - license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
+        from_file:
         start_line: 129
         end_line: 144
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 149
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf
-        spdx_license_expression: LicenseRef-scancode-ietf
-        rule_identifier: ietf_7.RULE
         rule_relevance: 90
+        rule_identifier: ietf_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_7.RULE
         matched_text: |
           This document and translations of it may be copied and furnished to
@@ -141,30 +141,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 147
         end_line: 147
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 148
         end_line: 163
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_480.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_480.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_480.RULE
         matched_text: |
           GnuPG is free software; you can redistribute it and/or modify
@@ -187,30 +187,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 165
         end_line: 165
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 166
         end_line: 181
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_191.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_191.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_191.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -233,30 +233,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 183
         end_line: 183
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 184
         end_line: '199'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 135
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_307.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_307.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_307.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -279,17 +279,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 202
         end_line: 225
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_910.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -320,17 +320,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 228
         end_line: 245
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -355,30 +355,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 247
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 248
         end_line: 253
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_131.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_131.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_131.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all
@@ -391,17 +391,17 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 81
         end_line: 81
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_321.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_321.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_321.RULE
         matched_text: This file is licensed permissively
     identifier: other_permissive-9b0e778e-b2cb-3f63-cd43-d76f05797558
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 7e8139f5101..10e10c5d409 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
@@ -42,17 +42,17 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 187
         end_line: 188
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_292.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_292.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_292.RULE
         matched_text: |
           Permission to use, copy, and distribute these images for any purpose and
@@ -61,17 +61,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 226
         end_line: 250
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_166.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -103,17 +103,17 @@ other_license_detections:
   - license_expression: bsd-new AND google-patent-license-golang
     license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 255
         end_line: 279
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_166.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -141,17 +141,17 @@ other_license_detections:
           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '95.0'
+      - license_expression: google-patent-license-golang
+        spdx_license_expression: LicenseRef-scancode-google-patent-license-golang
+        from_file:
         start_line: 281
         end_line: 294
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 131
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: google-patent-license-golang
-        spdx_license_expression: LicenseRef-scancode-google-patent-license-golang
-        rule_identifier: google-patent-license-golang_1.RULE
         rule_relevance: 95
+        rule_identifier: google-patent-license-golang_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/google-patent-license-golang_1.RULE
         matched_text: |
           Subject to the terms and conditions of this License, Google hereby
@@ -172,30 +172,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 296
         end_line: 296
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 297
         end_line: 310
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1019.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1019.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1019.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -216,17 +216,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 313
         end_line: 329
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -250,17 +250,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 336
         end_line: 355
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -287,17 +287,17 @@ other_license_detections:
   - license_expression: mpeg-ssg
     license_expression_spdx: MPEG-SSG
     matches:
-      - score: '100.0'
+      - license_expression: mpeg-ssg
+        spdx_license_expression: MPEG-SSG
+        from_file:
         start_line: 358
         end_line: 376
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 153
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mpeg-ssg
-        spdx_license_expression: MPEG-SSG
-        rule_identifier: mpeg-ssg_1.RULE
         rule_relevance: 100
+        rule_identifier: mpeg-ssg_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpeg-ssg_1.RULE
         matched_text: |
           These software programs are available to the user without any license fee or
@@ -323,17 +323,17 @@ other_license_detections:
   - license_expression: cc-by-3.0
     license_expression_spdx: CC-BY-3.0
     matches:
-      - score: '97.85'
+      - license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
+        from_file:
         start_line: 379
         end_line: 705
-        from_file:
+        matcher: 3-seq
+        score: '97.85'
         matched_length: 2686
         match_coverage: '97.85'
-        matcher: 3-seq
-        license_expression: cc-by-3.0
-        spdx_license_expression: CC-BY-3.0
-        rule_identifier: cc-by-3.0_102.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-3.0_102.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_102.RULE
         matched_text: |
           THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
@@ -667,17 +667,17 @@ other_license_detections:
   - license_expression: bsd-2-clause-views
     license_expression_spdx: BSD-2-Clause-Views
     matches:
-      - score: '98.1'
+      - license_expression: bsd-2-clause-views
+        spdx_license_expression: BSD-2-Clause-Views
+        from_file:
         start_line: 708
         end_line: 731
-        from_file:
+        matcher: 1-hash
+        score: '98.1'
         matched_length: 206
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-2-clause-views
-        spdx_license_expression: BSD-2-Clause-Views
-        rule_identifier: bsd-2-clause-views_11.RULE
         rule_relevance: 100
+        rule_identifier: bsd-2-clause-views_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-2-clause-views_11.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -708,17 +708,17 @@ other_license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 171
         end_line: 174
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
@@ -729,17 +729,17 @@ other_license_detections:
   - license_expression: cc-by-3.0
     license_expression_spdx: CC-BY-3.0
     matches:
-      - score: '100.0'
+      - license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
+        from_file:
         start_line: 209
         end_line: 211
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-3.0
-        spdx_license_expression: CC-BY-3.0
-        rule_identifier: cc-by-3.0_111.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-3.0_111.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_111.RULE
         matched_text: |
           are covered by the
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 1f2a89e287f..b5fb8a0edc2 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
@@ -10,30 +10,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 8
         end_line: 8
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 9
         end_line: 15
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 67
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_509.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_509.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_509.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify it
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 7726d7acd18..0813a8a8c87 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
@@ -24,17 +24,17 @@ other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 91
         end_line: 121
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 251
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -72,17 +72,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 126
         end_line: 156
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed under the Terms of Use in
@@ -120,17 +120,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 171
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -154,30 +154,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '194'
         end_line: '194'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '195'
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1330.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -199,30 +199,30 @@ other_license_detections:
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 211
         end_line: 211
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 212
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -237,17 +237,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this program; If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 225
         end_line: 226
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General Public
@@ -256,17 +256,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus OR mit
     license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
+        from_file:
         start_line: 229
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 282
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus OR mit
-        spdx_license_expression: GPL-2.0-or-later OR MIT
-        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
         matched_text: |
           This file is dual-licensed: you can use it either under the terms
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 7726d7acd18..0813a8a8c87 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
@@ -24,17 +24,17 @@ other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 91
         end_line: 121
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 251
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -72,17 +72,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 126
         end_line: 156
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed under the Terms of Use in
@@ -120,17 +120,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 171
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -154,30 +154,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '194'
         end_line: '194'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '195'
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1330.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -199,30 +199,30 @@ other_license_detections:
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 211
         end_line: 211
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 212
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -237,17 +237,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this program; If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 225
         end_line: 226
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General Public
@@ -256,17 +256,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus OR mit
     license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
+        from_file:
         start_line: 229
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 282
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus OR mit
-        spdx_license_expression: GPL-2.0-or-later OR MIT
-        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
         matched_text: |
           This file is dual-licensed: you can use it either under the terms
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 7726d7acd18..0813a8a8c87 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
@@ -24,17 +24,17 @@ other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 91
         end_line: 121
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 251
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -72,17 +72,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 126
         end_line: 156
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed under the Terms of Use in
@@ -120,17 +120,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 171
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -154,30 +154,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '194'
         end_line: '194'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '195'
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1330.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -199,30 +199,30 @@ other_license_detections:
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 211
         end_line: 211
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 212
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -237,17 +237,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this program; If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 225
         end_line: 226
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General Public
@@ -256,17 +256,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus OR mit
     license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
+        from_file:
         start_line: 229
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 282
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus OR mit
-        spdx_license_expression: GPL-2.0-or-later OR MIT
-        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
         matched_text: |
           This file is dual-licensed: you can use it either under the terms
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 7726d7acd18..0813a8a8c87 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
@@ -24,17 +24,17 @@ other_license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 91
         end_line: 121
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 251
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl-1.0-plus_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_9.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -72,17 +72,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 126
         end_line: 156
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed under the Terms of Use in
@@ -120,17 +120,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 171
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -154,30 +154,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '194'
         end_line: '194'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '195'
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1330.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1330.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1330.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -199,30 +199,30 @@ other_license_detections:
   - license_expression: lgpl-2.1 AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 211
         end_line: 211
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 212
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_62.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_62.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -237,17 +237,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this program; If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 225
         end_line: 226
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General Public
@@ -256,17 +256,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus OR mit
     license_expression_spdx: GPL-2.0-or-later OR MIT
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus OR mit
+        spdx_license_expression: GPL-2.0-or-later OR MIT
+        from_file:
         start_line: 229
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 282
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus OR mit
-        spdx_license_expression: GPL-2.0-or-later OR MIT
-        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_mit2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_mit2.RULE
         matched_text: |
           This file is dual-licensed: you can use it either under the terms
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 d794b6fcf87..e43ce5cae10 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
@@ -17,17 +17,17 @@ other_license_detections:
   - license_expression: unlicense
     license_expression_spdx: Unlicense
     matches:
-      - score: '100.0'
+      - license_expression: unlicense
+        spdx_license_expression: Unlicense
+        from_file:
         start_line: 33
         end_line: 54
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 189
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: unlicense
-        spdx_license_expression: Unlicense
-        rule_identifier: unlicense_6.RULE
         rule_relevance: 100
+        rule_identifier: unlicense_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unlicense_6.RULE
         matched_text: |
           This is free and unencumbered software released into the public domain.
@@ -56,17 +56,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 63
         end_line: 77
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -88,30 +88,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 79
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 80
         end_line: 86
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_419.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_419.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_419.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 d8281304104..8c29286a833 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
@@ -12,17 +12,17 @@ other_license_detections:
   - license_expression: tcl
     license_expression_spdx: TCL
     matches:
-      - score: '98.8'
+      - license_expression: tcl
+        spdx_license_expression: TCL
+        from_file:
         start_line: 13
         end_line: 53
-        from_file:
+        matcher: 3-seq
+        score: '98.8'
         matched_length: 328
         match_coverage: '98.8'
-        matcher: 3-seq
-        license_expression: tcl
-        spdx_license_expression: TCL
-        rule_identifier: tcl_3.RULE
         rule_relevance: 100
+        rule_identifier: tcl_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_3.RULE
         matched_text: |
           This software is copyrighted by Jan Nijtmans (the maintainer)
@@ -70,17 +70,17 @@ other_license_detections:
   - license_expression: pngsuite
     license_expression_spdx: LicenseRef-scancode-pngsuite
     matches:
-      - score: '100.0'
+      - license_expression: pngsuite
+        spdx_license_expression: LicenseRef-scancode-pngsuite
+        from_file:
         start_line: 56
         end_line: 57
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: pngsuite
-        spdx_license_expression: LicenseRef-scancode-pngsuite
-        rule_identifier: pngsuite.LICENSE
         rule_relevance: 100
+        rule_identifier: pngsuite.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pngsuite.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute these images for any
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 c0525892265..8280db99d96 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: x11-xconsortium-veillard
     license_expression_spdx: LicenseRef-scancode-x11-xconsortium-veillard
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium-veillard
+        spdx_license_expression: LicenseRef-scancode-x11-xconsortium-veillard
+        from_file:
         start_line: 15
         end_line: 34
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '199'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium-veillard
-        spdx_license_expression: LicenseRef-scancode-x11-xconsortium-veillard
-        rule_identifier: x11-xconsortium-veillard.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium-veillard.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-xconsortium-veillard.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -44,17 +44,17 @@ license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 43
         end_line: 62
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '198'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_4.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_4.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
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 7bc70b223b6..a5d991749bd 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
@@ -150,17 +150,17 @@ other_license_detections:
   - license_expression: other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
-      - score: '90.0'
+      - license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 304
         end_line: 305
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-copyleft
-        rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
+        rule_identifier: other-copyleft_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
         matched_text: |
           Everyone is permitted to copy and distribute verbatim copies
@@ -169,17 +169,17 @@ other_license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 386
         end_line: 387
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free2.RULE
         rule_relevance: 100
+        rule_identifier: fsf-free2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-free2.RULE
         matched_text: |
           This file is free documentation; the Free Software Foundation gives
@@ -188,17 +188,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 505
         end_line: 519
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -220,17 +220,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus WITH bison-exception-2.2
     license_expression_spdx: GPL-2.0-or-later WITH Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-2.0-or-later WITH Bison-exception-2.2
+        from_file:
         start_line: 562
         end_line: 588
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 216
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus WITH bison-exception-2.2
-        spdx_license_expression: GPL-2.0-or-later WITH Bison-exception-2.2
-        rule_identifier: gpl-2.0-plus_with_bison-exception-2.2_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_bison-exception-2.2_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_bison-exception-2.2_1.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -264,17 +264,17 @@ other_license_detections:
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
     license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
+        from_file:
         start_line: 597
         end_line: 621
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH bison-exception-2.2
-        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
-        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -306,17 +306,17 @@ other_license_detections:
   - license_expression: stlport-4.5
     license_expression_spdx: LicenseRef-scancode-stlport-4.5
     matches:
-      - score: '100.0'
+      - license_expression: stlport-4.5
+        spdx_license_expression: LicenseRef-scancode-stlport-4.5
+        from_file:
         start_line: 734
         end_line: 741
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 76
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: stlport-4.5
-        spdx_license_expression: LicenseRef-scancode-stlport-4.5
-        rule_identifier: stlport-4.5.LICENSE
         rule_relevance: 100
+        rule_identifier: stlport-4.5.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/stlport-4.5.LICENSE
         matched_text: |
           This material is provided "as is", with absolutely no warranty expressed
@@ -331,17 +331,17 @@ other_license_detections:
   - license_expression: x11-xconsortium AND public-domain
     license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 807
         end_line: 827
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -365,47 +365,47 @@ other_license_detections:
           be used in advertising or otherwise to promote the sale, use or other deal-
           ings in this Software without prior written authorization from the X Consor-
           tium.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 829
         end_line: 829
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_58.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_58.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-85b6bf80-9de9-fe71-fa83-14be44f52a4b
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 850
         end_line: 850
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 851
         end_line: 865
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1329.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1329.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1329.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -427,30 +427,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 867
         end_line: 867
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 868
         end_line: 883
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 129
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_1036.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_1036.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1036.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -473,30 +473,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 885
         end_line: 885
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 886
         end_line: 902
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_415.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_415.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_415.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -520,30 +520,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.0
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 904
         end_line: 904
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
+        from_file:
         start_line: 905
         end_line: 922
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 136
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0
-        spdx_license_expression: LGPL-2.0-only
-        rule_identifier: lgpl-2.0_189.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_189.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -568,17 +568,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '53.47'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 925
         end_line: 934
-        from_file:
+        matcher: 3-seq
+        score: '53.47'
         matched_length: 60
         match_coverage: '59.41'
-        matcher: 3-seq
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1036.RULE
         rule_relevance: 90
+        rule_identifier: bsd-new_1036.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1036.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -595,17 +595,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 937
         end_line: 959
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -635,30 +635,30 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 961
         end_line: 961
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
         matched_text: 'License: artistic'
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 962
         end_line: 1088
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 960
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0.LICENSE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-perl-1.0.LICENSE
         matched_text: |
           The "Artistic License"
@@ -792,47 +792,47 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1091
         end_line: 1091
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_38.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE
         matched_text: is public domain (
     identifier: public_domain-7d49b7ad-8b9e-60cd-5fde-397e63b65786
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1093
         end_line: 1093
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1094
         end_line: 1108
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_83.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_83.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_83.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -854,30 +854,30 @@ other_license_detections:
   - license_expression: lgpl-2.0
     license_expression_spdx: LGPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
+        from_file:
         start_line: 1110
         end_line: 1110
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0
-        spdx_license_expression: LGPL-2.0-only
-        rule_identifier: lgpl-2.0_12.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE
         matched_text: 'License: lgpl-2'
-      - score: '100.0'
+      - license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
+        from_file:
         start_line: 1111
         end_line: 1124
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 116
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0
-        spdx_license_expression: LGPL-2.0-only
-        rule_identifier: lgpl-2.0_187.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_187.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_187.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -898,17 +898,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 201
         end_line: 210
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1328.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1328.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1328.RULE
         matched_text: |
           These files fall under the blanket license specified in the file
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 06d8340270f..f0c593a11d9 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
@@ -40,30 +40,30 @@ other_license_detections:
   - license_expression: public-domain AND us-govt-public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 92
         end_line: 92
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_128.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_128.RULE
         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,
-      - score: '100.0'
+      - license_expression: us-govt-public-domain
+        spdx_license_expression: LicenseRef-scancode-us-govt-public-domain
+        from_file:
         start_line: 94
         end_line: 112
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 158
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: us-govt-public-domain
-        spdx_license_expression: LicenseRef-scancode-us-govt-public-domain
-        rule_identifier: us-govt-public-domain_24.RULE
         rule_relevance: 100
+        rule_identifier: us-govt-public-domain_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/us-govt-public-domain_24.RULE
         matched_text: |
           PUBLIC DOMAIN NOTICE
@@ -89,17 +89,17 @@ other_license_detections:
   - license_expression: boost-1.0
     license_expression_spdx: BSL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
+        from_file:
         start_line: 115
         end_line: 135
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 202
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: boost-1.0
-        spdx_license_expression: BSL-1.0
-        rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: boost-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person or organization
@@ -127,17 +127,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 138
         end_line: 154
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -161,17 +161,17 @@ other_license_detections:
   - license_expression: mit-with-modification-obligations AND proprietary-license
     license_expression_spdx: HPND-export-US-modify AND LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
+        from_file:
         start_line: 157
         end_line: 172
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 153
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-with-modification-obligations
-        spdx_license_expression: HPND-export-US-modify
-        rule_identifier: mit-with-modification-obligations_4.RULE
         rule_relevance: 100
+        rule_identifier: mit-with-modification-obligations_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_4.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and its
@@ -190,17 +190,17 @@ other_license_detections:
           THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
           WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
           MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 179
         end_line: 185
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_136.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
         matched_text: |
           No commercial use of these trademarks may be made without prior
@@ -214,17 +214,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 188
         end_line: '194'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 36
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_359.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_359.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_359.RULE
         matched_text: |
           This source file is placed in the public domian.
@@ -238,17 +238,17 @@ other_license_detections:
   - license_expression: flex-2.5
     license_expression_spdx: BSD-3-Clause-flex
     matches:
-      - score: '100.0'
+      - license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
+        from_file:
         start_line: '197'
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 122
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: flex-2.5
-        spdx_license_expression: BSD-3-Clause-flex
-        rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
+        rule_identifier: flex-2.5_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -268,30 +268,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 211
         end_line: 211
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 212
         end_line: 231
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 139
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_845.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_845.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_845.RULE
         matched_text: |
           This program is free software; you can redistribute it
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 1f49a028dbc..b5ad803f605 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: x11-fsf
     license_expression_spdx: X11-distribute-modifications-variant
     matches:
-      - score: '100.0'
+      - license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
+        from_file:
         start_line: 23
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-fsf
-        spdx_license_expression: X11-distribute-modifications-variant
-        rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-fsf.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -48,17 +48,17 @@ license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 50
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -86,17 +86,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 76
         end_line: 98
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -126,17 +126,17 @@ license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 105
         end_line: 127
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '199'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_41.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
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 f68e0dc61a4..31b32e27dce 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
@@ -19,17 +19,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 30
         end_line: 46
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -53,17 +53,17 @@ other_license_detections:
   - license_expression: boost-1.0
     license_expression_spdx: BSL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
+        from_file:
         start_line: 49
         end_line: 70
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: boost-1.0
-        spdx_license_expression: BSL-1.0
-        rule_identifier: boost-1.0_24.RULE
         rule_relevance: 100
+        rule_identifier: boost-1.0_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_24.RULE
         matched_text: |
           Boost Software License Version 1.0
@@ -92,30 +92,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 72
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 73
         end_line: 78
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 59
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1296.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -128,30 +128,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 80
         end_line: 80
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 81
         end_line: 87
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_985.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_985.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_985.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
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 1c19f4cd1ba..15e6a56887c 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
@@ -44,17 +44,17 @@ other_license_detections:
   - license_expression: apache-2.0 AND lgpl-2.1
     license_expression_spdx: Apache-2.0 AND LGPL-2.1-only
     matches:
-      - score: '90.0'
+      - license_expression: apache-2.0 AND lgpl-2.1
+        spdx_license_expression: Apache-2.0 AND LGPL-2.1-only
+        from_file:
         start_line: 162
         end_line: 175
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0 AND lgpl-2.1
-        spdx_license_expression: Apache-2.0 AND LGPL-2.1-only
-        rule_identifier: apache-2.0_and_lgpl-2.1_2.RULE
         rule_relevance: 90
+        rule_identifier: apache-2.0_and_lgpl-2.1_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_lgpl-2.1_2.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,17 +75,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 178
         end_line: '199'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_942.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_942.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_942.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -114,17 +114,17 @@ other_license_detections:
   - license_expression: boost-1.0
     license_expression_spdx: BSL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
+        from_file:
         start_line: 202
         end_line: 222
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 202
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: boost-1.0
-        spdx_license_expression: BSL-1.0
-        rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: boost-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person or organization
@@ -152,17 +152,17 @@ other_license_detections:
   - license_expression: cc-by-3.0
     license_expression_spdx: CC-BY-3.0
     matches:
-      - score: '100.0'
+      - license_expression: cc-by-3.0
+        spdx_license_expression: CC-BY-3.0
+        from_file:
         start_line: 225
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc-by-3.0
-        spdx_license_expression: CC-BY-3.0
-        rule_identifier: cc-by-3.0_110.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-3.0_110.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-3.0_110.RULE
         matched_text: |
           Creative Commons Legal Code
@@ -192,30 +192,30 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 250
         end_line: 250
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_26.RULE
         rule_relevance: 100
+        rule_identifier: mit_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE
         matched_text: The MIT License (MIT)
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 252
         end_line: 268
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -239,30 +239,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 270
         end_line: 270
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 271
         end_line: 283
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_420.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_420.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -278,17 +278,17 @@ other_license_detections:
           You should have received a copy of the GNU General Public License
           along with this program; if not, write to the Free Software Foundation,
           Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 285
         end_line: 286
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_843.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_843.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_843.RULE
         matched_text: |
           On Debian systems a full copy of the GPL 2 can be found at
@@ -297,30 +297,30 @@ other_license_detections:
   - license_expression: gpl-3.0
     license_expression_spdx: GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 288
         end_line: 288
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_rdesc_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_rdesc_1.RULE
         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'
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 289
         end_line: 303
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_417.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_417.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_417.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -342,30 +342,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 305
         end_line: 305
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 306
         end_line: 314
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 91
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_313.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_313.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_313.RULE
         matched_text: |
           This file may be used under the terms of the GNU Lesser General Public
@@ -381,30 +381,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 316
         end_line: 316
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 317
         end_line: 332
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_312.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_312.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_312.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -427,17 +427,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 335
         end_line: 337
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_47.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_47.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_47.RULE
         matched_text: |
           This software is in the public domain, furnished "as is", without technical
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 5d4d11ac186..b5e5243f358 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
@@ -38,17 +38,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 110
         end_line: 130
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -76,17 +76,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 135
         end_line: 157
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -116,17 +116,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 160
         end_line: 182
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -156,17 +156,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 185
         end_line: 201
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
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 6ff72ce84ae..476d92609f6 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
@@ -18,17 +18,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.53'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 26
         end_line: 45
-        from_file:
+        matcher: 1-hash
+        score: '99.53'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_314.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_314.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_314.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -55,17 +55,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 48
         end_line: 67
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -92,30 +92,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 71
         end_line: 71
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 72
         end_line: 86
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_846.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -137,17 +137,17 @@ other_license_detections:
   - license_expression: warranty-disclaimer
     license_expression_spdx: LicenseRef-scancode-warranty-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: warranty-disclaimer
+        spdx_license_expression: LicenseRef-scancode-warranty-disclaimer
+        from_file:
         start_line: 89
         end_line: 89
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: warranty-disclaimer
-        spdx_license_expression: LicenseRef-scancode-warranty-disclaimer
-        rule_identifier: warranty-disclaimer_78.RULE
         rule_relevance: 100
+        rule_identifier: warranty-disclaimer_78.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_78.RULE
         matched_text: NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
     identifier: warranty_disclaimer-7ce752f1-3fd2-5c9f-d85a-ceb48cc6e7c9
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 f3fe7b6aee3..ac94b0c8fd2 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
@@ -10,30 +10,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus AND gpl-3.0
     license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 12
         end_line: 12
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 13
         end_line: 24
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -48,30 +48,30 @@ other_license_detections:
 
           You should have received a copy of the GNU General Public License
           along with this program.  If not, see .
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 26
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_378.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_378.RULE
         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
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 27
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_93.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_93.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_93.RULE
         matched_text: usr/share/common-licenses/GPL-3.
     identifier: gpl_3_0_plus_and_gpl_3_0-60967129-5b9c-1055-6b3f-a7dc475d5b0b
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 aa16873274f..8bc829e404d 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
@@ -23,17 +23,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 38
         end_line: 61
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: "Redistribution and use in source and binary forms, with or without\n\
           modification, are permitted provided that the following conditions are\tmet:\n\n1.\
@@ -57,30 +57,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 63
         end_line: 63
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 64
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 94
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_353.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_353.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_353.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -94,17 +94,17 @@ other_license_detections:
 
           You should have received a copy of the GNU General Public License
           along with this program. If not, see .
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 76
         end_line: 77
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1290.RULE
         matched_text: |
           The complete text of the GNU General Public License
@@ -113,30 +113,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 79
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 80
         end_line: 94
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 122
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_983.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_983.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_983.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -158,30 +158,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 96
         end_line: 96
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 97
         end_line: 110
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 120
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_453.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_453.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_453.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -202,17 +202,17 @@ other_license_detections:
   - license_expression: isc AND ibm-dhcp
     license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 113
         end_line: 123
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any purpose
@@ -226,17 +226,17 @@ other_license_detections:
           DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
           ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
           CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-      - score: '100.0'
+      - license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
+        from_file:
         start_line: 127
         end_line: 145
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ibm-dhcp
-        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
-        rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
+        rule_identifier: ibm-dhcp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
         matched_text: |
           International Business Machines, Inc. (hereinafter called IBM) grants
@@ -262,17 +262,17 @@ other_license_detections:
   - license_expression: xfree86-1.0
     license_expression_spdx: LicenseRef-scancode-xfree86-1.0
     matches:
-      - score: '100.0'
+      - license_expression: xfree86-1.0
+        spdx_license_expression: LicenseRef-scancode-xfree86-1.0
+        from_file:
         start_line: 148
         end_line: 169
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: xfree86-1.0
-        spdx_license_expression: LicenseRef-scancode-xfree86-1.0
-        rule_identifier: xfree86-1.0_2.RULE
         rule_relevance: 100
+        rule_identifier: xfree86-1.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/xfree86-1.0_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
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 e26d845b7a5..ef8c68dd168 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
@@ -14,17 +14,17 @@ license_detections:
   - license_expression: openldap-2.8
     license_expression_spdx: OLDAP-2.8
     matches:
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 17
         end_line: 37
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8_21.RULE
         rule_relevance: 100
+        rule_identifier: openldap-2.8_21.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_21.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -48,17 +48,17 @@ license_detections:
 
           Additional information about OpenLDAP can be obtained at
           .
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 41
         end_line: 81
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 297
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8_16.RULE
         rule_relevance: 100
+        rule_identifier: openldap-2.8_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_16.RULE
         matched_text: |
           The OpenLDAP Public License
@@ -106,17 +106,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 91
         end_line: 107
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_483.RULE
         rule_relevance: 100
+        rule_identifier: mit_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -140,17 +140,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 115
         end_line: 122
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty_2.RULE
         matched_text: |
           This Makefile.in is free software; the Free Software Foundation
@@ -165,17 +165,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '95.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 129
         end_line: 145
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 123
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp_5.RULE
         rule_relevance: 95
+        rule_identifier: hs-regexp_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_5.RULE
         matched_text: |
           Permission is granted to anyone to use this software for any purpose
@@ -199,17 +199,17 @@ license_detections:
   - license_expression: ibm-dhcp
     license_expression_spdx: LicenseRef-scancode-ibm-dhcp
     matches:
-      - score: '100.0'
+      - license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
+        from_file:
         start_line: 154
         end_line: 173
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ibm-dhcp
-        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
-        rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
+        rule_identifier: ibm-dhcp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
         matched_text: |
           International Business Machines, Inc. (hereinafter called IBM) grants
@@ -236,17 +236,17 @@ license_detections:
   - license_expression: ietf
     license_expression_spdx: LicenseRef-scancode-ietf
     matches:
-      - score: '100.0'
+      - license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
+        from_file:
         start_line: 180
         end_line: 206
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 221
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf
-        spdx_license_expression: LicenseRef-scancode-ietf
-        rule_identifier: ietf_5.RULE
         rule_relevance: 100
+        rule_identifier: ietf_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_5.RULE
         matched_text: "Full Copyright Statement\n# \n#    Copyright (C) The Internet Society\
           \ (1999).  All Rights Reserved.\n# \n#    This document and translations of it may\
@@ -271,17 +271,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 227
         end_line: 238
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -300,17 +300,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 245
         end_line: 250
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_203.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_203.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_203.RULE
         matched_text: "This software is not subject to any license of Silicon Graphics \n *\
           \ Inc. or Purdue University.\n *\n * Redistribution and use in source and binary forms\
@@ -320,17 +320,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 277
         end_line: 283
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_200.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_200.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_200.RULE
         matched_text: "This software is not subject to any license of Carnegie Mellon University.\n\
           \ *\n * Redistribution and use in source and binary forms are permitted without \n\
@@ -341,17 +341,17 @@ license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 311
         end_line: 319
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 96
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_3.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software and its
@@ -367,17 +367,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 327
         end_line: 328
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_199.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_199.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_199.RULE
         matched_text: |
           Permission to copy and
@@ -386,17 +386,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '95.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 337
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 123
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp_5.RULE
         rule_relevance: 95
+        rule_identifier: hs-regexp_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_5.RULE
         matched_text: |
           Permission is granted to anyone to use this software for any purpose
@@ -419,17 +419,17 @@ license_detections:
   - license_expression: openldap-2.8
     license_expression_spdx: OLDAP-2.8
     matches:
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 359
         end_line: 362
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 43
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8_15.RULE
         rule_relevance: 100
+        rule_identifier: openldap-2.8_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openldap-2.8_15.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted only
@@ -440,17 +440,17 @@ license_detections:
   - license_expression: bsla AND bsd-original-uc
     license_expression_spdx: BSD-4.3TAHOE AND BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
+        from_file:
         start_line: 368
         end_line: 378
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 101
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsla
-        spdx_license_expression: BSD-4.3TAHOE
-        rule_identifier: bsla_3.RULE
         rule_relevance: 100
+        rule_identifier: bsla_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsla_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -464,17 +464,17 @@ license_detections:
            * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
            * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
            * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 380
         end_line: 381
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_25.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_25.RULE
         matched_text: |
           NOTE: The Regents have since retroactively removed the advertising
@@ -483,17 +483,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 388
         end_line: 414
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -523,17 +523,17 @@ license_detections:
            * LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 416
         end_line: 419
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_24.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_24.RULE
         matched_text: |
           NOTE: The Regents have since retroactively removed the advertising
@@ -544,17 +544,17 @@ license_detections:
   - license_expression: bsd-original-uc-1986
     license_expression_spdx: BSD-4.3RENO
     matches:
-      - score: '99.0'
+      - license_expression: bsd-original-uc-1986
+        spdx_license_expression: BSD-4.3RENO
+        from_file:
         start_line: 426
         end_line: 431
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc-1986
-        spdx_license_expression: BSD-4.3RENO
-        rule_identifier: bsd-original-uc-1986_3.RULE
         rule_relevance: 99
+        rule_identifier: bsd-original-uc-1986_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc-1986_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
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 424bafcb547..0b59d14e00e 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
@@ -13,30 +13,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 15
         end_line: 15
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 16
         end_line: 30
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 130
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_173.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_173.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_173.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -58,30 +58,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 32
         end_line: 32
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 33
         end_line: 47
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_323.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_323.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_323.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
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 0e36ff52b5d..032dfa0ff23 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
@@ -22,17 +22,17 @@ other_license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 27
         end_line: 29
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation gives
@@ -42,17 +42,17 @@ other_license_detections:
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
     license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
+        from_file:
         start_line: 39
         end_line: 51
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus WITH libtool-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
-        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_8.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_8.RULE
         matched_text: |
           GNU Libtool is free software; you can redistribute it and/or modify
@@ -72,30 +72,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 54
         end_line: 54
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 55
         end_line: 61
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_842.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_842.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_842.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it under
@@ -109,30 +109,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 63
         end_line: 63
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 64
         end_line: 70
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 68
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_387.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_387.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_387.RULE
         matched_text: |
           This file is free software: you can redistribute it and/or modify
@@ -146,17 +146,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 73
         end_line: 95
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_5.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_5.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 fbe92b269c2..ed83120caf9 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
@@ -33,17 +33,17 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 85
         end_line: 87
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_324.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_324.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_324.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this example
@@ -53,17 +53,17 @@ other_license_detections:
   - license_expression: x11
     license_expression_spdx: ICU
     matches:
-      - score: '100.0'
+      - license_expression: x11
+        spdx_license_expression: ICU
+        from_file:
         start_line: 90
         end_line: 116
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 241
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11
-        spdx_license_expression: ICU
-        rule_identifier: x11_2.RULE
         rule_relevance: 100
+        rule_identifier: x11_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -97,30 +97,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 118
         end_line: 118
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 119
         end_line: 130
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_529.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_529.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_529.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -139,17 +139,17 @@ other_license_detections:
   - license_expression: tcl
     license_expression_spdx: TCL
     matches:
-      - score: '100.0'
+      - license_expression: tcl
+        spdx_license_expression: TCL
+        from_file:
         start_line: 133
         end_line: 171
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 341
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: tcl
-        spdx_license_expression: TCL
-        rule_identifier: tcl_14.RULE
         rule_relevance: 100
+        rule_identifier: tcl_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE
         matched_text: |
           This software is copyrighted by the Regents of the University of
@@ -195,17 +195,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 174
         end_line: 224
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 423
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_57.RULE
         rule_relevance: 100
+        rule_identifier: unicode_57.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_57.RULE
         matched_text: |
           Unicode Data Files include all data files under the directories
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 60430c78490..798f6d45343 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
@@ -740,30 +740,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 2100
         end_line: 2100
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 2101
         end_line: 2102
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_249.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_249.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_249.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the LGPL 2.1
@@ -772,30 +772,30 @@ other_license_detections:
   - license_expression: gpl-1.0-plus AND gpl-1.0
     license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 2104
         end_line: 2104
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_395.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
+        from_file:
         start_line: 2105
         end_line: 2106
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0
-        spdx_license_expression: GPL-1.0-only
-        rule_identifier: gpl-1.0_38.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_38.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the GNU General
@@ -804,30 +804,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 2108
         end_line: 2108
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 2109
         end_line: 2111
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1040.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1040.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1040.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of version 2 of
@@ -837,30 +837,30 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 2113
         end_line: 2113
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
         matched_text: 'License: artistic'
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 2114
         end_line: 2115
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_2.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the
@@ -869,17 +869,17 @@ other_license_detections:
   - license_expression: artistic-2.0
     license_expression_spdx: Artistic-2.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
+        from_file:
         start_line: 2118
         end_line: 2299
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1354
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0
-        spdx_license_expression: Artistic-2.0
-        rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
         matched_text: |
           Copyright (c) 2000-2006, The Perl Foundation.
@@ -1068,17 +1068,17 @@ other_license_detections:
   - license_expression: bzip2-libbzip-2010
     license_expression_spdx: bzip2-1.0.6
     matches:
-      - score: '100.0'
+      - license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
+        from_file:
         start_line: 2302
         end_line: 2331
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 233
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bzip2-libbzip-2010
-        spdx_license_expression: bzip2-1.0.6
-        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
+        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1115,17 +1115,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 2337
         end_line: 2351
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -1147,17 +1147,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 2354
         end_line: 2370
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1181,17 +1181,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2373
         end_line: 2395
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1221,17 +1221,17 @@ other_license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '98.25'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 2398
         end_line: 2424
-        from_file:
+        matcher: 1-hash
+        score: '98.25'
         matched_length: 224
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_80.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_80.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_80.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1265,17 +1265,17 @@ other_license_detections:
   - license_expression: unicode-dfs-2015
     license_expression_spdx: Unicode-DFS-2015
     matches:
-      - score: '99.57'
+      - license_expression: unicode-dfs-2015
+        spdx_license_expression: Unicode-DFS-2015
+        from_file:
         start_line: 2428
         end_line: 2482
-        from_file:
+        matcher: 3-seq
+        score: '99.57'
         matched_length: 468
         match_coverage: '99.57'
-        matcher: 3-seq
-        license_expression: unicode-dfs-2015
-        spdx_license_expression: Unicode-DFS-2015
-        rule_identifier: unicode-dfs-2015_9.RULE
         rule_relevance: 100
+        rule_identifier: unicode-dfs-2015_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode-dfs-2015_9.RULE
         matched_text: |
           UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
@@ -1337,17 +1337,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2485
         end_line: 2507
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 207
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_313.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_313.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_313.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1377,17 +1377,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2510
         end_line: 2532
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1417,17 +1417,17 @@ other_license_detections:
   - license_expression: regexp
     license_expression_spdx: Spencer-86
     matches:
-      - score: '100.0'
+      - license_expression: regexp
+        spdx_license_expression: Spencer-86
+        from_file:
         start_line: 2535
         end_line: 2547
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: regexp
-        spdx_license_expression: Spencer-86
-        rule_identifier: regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/regexp.LICENSE
         matched_text: |
           Permission is granted to anyone to use this software for any
@@ -1447,17 +1447,17 @@ other_license_detections:
   - license_expression: ttwl
     license_expression_spdx: TTWL
     matches:
-      - score: '100.0'
+      - license_expression: ttwl
+        spdx_license_expression: TTWL
+        from_file:
         start_line: 2550
         end_line: 2554
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 43
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: ttwl
-        spdx_license_expression: TTWL
-        rule_identifier: ttwl.LICENSE
         rule_relevance: 100
+        rule_identifier: ttwl.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ttwl.LICENSE
         matched_text: |
           This module may be modified, used, copied, and redistributed at your own risk.
@@ -1469,17 +1469,17 @@ other_license_detections:
   - license_expression: other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
-      - score: '100.0'
+      - license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 2557
         end_line: 2559
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-copyleft
-        rule_identifier: other-copyleft_20.RULE
         rule_relevance: 100
+        rule_identifier: other-copyleft_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_20.RULE
         matched_text: |
           This program is free and open software. You may use, modify,
@@ -1489,17 +1489,17 @@ other_license_detections:
   - license_expression: other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
-      - score: '90.0'
+      - license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 2562
         end_line: 2563
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-copyleft
-        rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
+        rule_identifier: other-copyleft_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
         matched_text: |
           Everyone is permitted to copy and distribute verbatim copies
@@ -1508,73 +1508,73 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2569
         end_line: 2569
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_45.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_45.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2574
         end_line: 2574
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_285.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_285.RULE
         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,
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2575
         end_line: 2575
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public-domain
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2584
         end_line: 2584
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public  domain
     identifier: public_domain-d6560563-b3c0-65ee-7cca-7225d652d54d
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
     license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
+        from_file:
         start_line: 2588
         end_line: 2612
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH bison-exception-2.2
-        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
-        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -1606,17 +1606,17 @@ other_license_detections:
   - license_expression: paul-hsieh-derivative
     license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative
     matches:
-      - score: '100.0'
+      - license_expression: paul-hsieh-derivative
+        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
+        from_file:
         start_line: 2615
         end_line: 2630
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: paul-hsieh-derivative
-        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
-        rule_identifier: paul-hsieh-derivative_1.RULE
         rule_relevance: 100
+        rule_identifier: paul-hsieh-derivative_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/paul-hsieh-derivative_1.RULE
         matched_text: |
           The derivative content includes raw computer source code, ideas,
@@ -1639,17 +1639,17 @@ other_license_detections:
   - license_expression: bsd-x11
     license_expression_spdx: LicenseRef-scancode-bsd-x11
     matches:
-      - score: '99.0'
+      - license_expression: bsd-x11
+        spdx_license_expression: LicenseRef-scancode-bsd-x11
+        from_file:
         start_line: 2636
         end_line: 2661
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-x11
-        spdx_license_expression: LicenseRef-scancode-bsd-x11
-        rule_identifier: bsd-x11_10.RULE
         rule_relevance: 99
+        rule_identifier: bsd-x11_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-x11_10.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1682,30 +1682,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 2663
         end_line: 2663
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 2664
         end_line: 2783
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 981
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_155.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_155.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE
         matched_text: |
           Statatement of Purpose
@@ -1832,17 +1832,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 2790
         end_line: 2793
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-ap.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
         matched_text: |
           Copying and distribution of this file, with or without modification, are
@@ -1853,17 +1853,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
+        from_file:
         start_line: 2796
         end_line: 2920
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 947
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-dist-1.0
-        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
-        rule_identifier: artistic-dist-1.0.LICENSE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-dist-1.0.LICENSE
         matched_text: |
           The "Artistic License"
@@ -1995,17 +1995,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 20
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 49
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -2020,102 +2020,102 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 54
         end_line: 54
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 64
         end_line: 64
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 72
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 82
         end_line: 82
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 113
         end_line: 114
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2124,17 +2124,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 126
         end_line: 127
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it
@@ -2143,34 +2143,34 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 136
         end_line: 136
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_14.RULE
         rule_relevance: 100
+        rule_identifier: unicode_14.RULE
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 146
         end_line: 148
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2180,17 +2180,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 154
         end_line: 155
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software. You can redistribute it
@@ -2199,17 +2199,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 162
         end_line: 163
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2218,68 +2218,68 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 170
         end_line: 170
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         matched_text: All files are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4e05fce9-1807-80b2-856e-0fa39a440170
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '90.91'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 177
         end_line: 177
-        from_file:
+        matcher: 1-hash
+        score: '90.91'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         matched_text: The PerlUi class is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-522746e5-bffc-fa4c-ea81-334067779aac
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '91.67'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 185
         end_line: 185
-        from_file:
+        matcher: 1-hash
+        score: '91.67'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         matched_text: The Symbian port is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-7e59d507-72c7-19bf-6165-d58bcc316f9a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: '195'
         end_line: '196'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         matched_text: |
           It is assumed that the test code is licensed under the same terms
@@ -2288,17 +2288,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 202
         end_line: 203
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2307,17 +2307,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 212
         end_line: 213
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it
@@ -2326,17 +2326,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 220
         end_line: 221
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2345,17 +2345,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 228
         end_line: 229
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under the same
@@ -2364,17 +2364,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 236
         end_line: 237
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2383,17 +2383,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 246
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2402,34 +2402,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 258
         end_line: 258
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 264
         end_line: 265
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         matched_text: |
           This library is free software; you may redistribute and/or modify
@@ -2438,34 +2438,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 278
         end_line: 278
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 284
         end_line: 285
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         matched_text: |
           This module is free software, you may distribute it under the
@@ -2474,17 +2474,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 293
         end_line: 295
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 31
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         matched_text: |
           This is free software.  You may modify and/or redistribute this
@@ -2494,17 +2494,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 303
         end_line: 304
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         matched_text: |
           This module is free software.  You may distribute it under the
@@ -2513,17 +2513,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 312
         end_line: 319
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 50
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_13.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_13.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_13.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -2538,17 +2538,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 325
         end_line: 326
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -2557,17 +2557,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -2576,17 +2576,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 358
         end_line: 359
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2595,17 +2595,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 365
         end_line: 366
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2614,34 +2614,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 374
         end_line: 374
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         matched_text: You may redistribute this under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-d15d44f1-6970-d898-4fa2-eb72ec024222
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 382
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2650,17 +2650,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 394
         end_line: 395
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2669,17 +2669,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 402
         end_line: 403
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2688,17 +2688,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 410
         end_line: 411
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2707,17 +2707,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 417
         end_line: 418
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -2726,17 +2726,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 427
         end_line: 428
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2745,17 +2745,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 435
         end_line: 436
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2764,17 +2764,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 444
         end_line: 445
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -2783,17 +2783,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 454
         end_line: 455
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -2802,17 +2802,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 462
         end_line: 463
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2821,17 +2821,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 469
         end_line: 470
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2840,17 +2840,17 @@ other_license_detections:
   - license_expression: artistic-2.0
     license_expression_spdx: Artistic-2.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
+        from_file:
         start_line: 476
         end_line: 477
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0
-        spdx_license_expression: Artistic-2.0
-        rule_identifier: artistic-2.0_38.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_38.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2859,17 +2859,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 484
         end_line: 485
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2878,17 +2878,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 492
         end_line: 493
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2897,17 +2897,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 500
         end_line: 509
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         matched_text: |
           There are no copyright or license notices in this distribution. It
@@ -2924,17 +2924,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 517
         end_line: 518
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -2943,17 +2943,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 524
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it
@@ -2962,17 +2962,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 540
         end_line: 541
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         matched_text: |
           This library is free software; you may redistribute and/or modify it
@@ -2981,17 +2981,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 549
         end_line: 550
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3000,17 +3000,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 558
         end_line: 559
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3019,17 +3019,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 568
         end_line: 569
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3038,17 +3038,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
+        from_file:
         start_line: 576
         end_line: 580
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 47
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-2.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3060,17 +3060,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 587
         end_line: 588
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3079,17 +3079,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 595
         end_line: 596
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3098,17 +3098,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 603
         end_line: 604
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute
@@ -3117,17 +3117,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 613
         end_line: 614
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3136,17 +3136,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 621
         end_line: 622
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3155,17 +3155,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 630
         end_line: 631
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3174,17 +3174,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 638
         end_line: 639
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public License
@@ -3193,17 +3193,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 646
         end_line: 647
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3212,17 +3212,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 657
         end_line: 658
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3231,17 +3231,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 664
         end_line: 665
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3250,17 +3250,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 676
         end_line: 677
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -3269,17 +3269,17 @@ other_license_detections:
   - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 684
         end_line: 686
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_relevance: 100
+        rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         matched_text: |
           This software is released under the MIT license cited below.  Additionally,
@@ -3289,17 +3289,17 @@ other_license_detections:
   - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '99.0'
+      - 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
+        from_file:
         start_line: 700
         end_line: 701
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 99
+        rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         matched_text: |
           It is assumed that these translations are licensed under the same terms as
@@ -3308,17 +3308,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 707
         end_line: 708
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3327,17 +3327,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 715
         end_line: 719
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 34
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         matched_text: |
           This library is free software; you may redistribute it and/or modify
@@ -3349,17 +3349,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 727
         end_line: 728
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3368,32 +3368,32 @@ other_license_detections:
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND metamail
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 736
         end_line: 737
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: metamail
+        spdx_license_expression: metamail
+        from_file:
         start_line: 744
         end_line: 753
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: metamail
-        spdx_license_expression: metamail
-        rule_identifier: metamail.LICENSE
         rule_relevance: 100
+        rule_identifier: metamail.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this material
@@ -3410,17 +3410,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 761
         end_line: 762
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3429,17 +3429,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 769
         end_line: 770
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -3448,34 +3448,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 777
         end_line: 777
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         matched_text: This module is released under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-6ac722a3-703c-e413-9b17-5dd475d88fa5
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 784
         end_line: 785
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3484,17 +3484,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 792
         end_line: 793
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3503,17 +3503,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 800
         end_line: 801
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3522,17 +3522,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 808
         end_line: 810
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software;
@@ -3542,17 +3542,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 817
         end_line: 818
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3561,17 +3561,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 827
         end_line: 828
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3580,17 +3580,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 836
         end_line: 837
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3599,17 +3599,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 868
         end_line: 869
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3618,17 +3618,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 882
         end_line: 883
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software; you can redistribute it and/or modify it
@@ -3637,17 +3637,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 890
         end_line: 891
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3656,17 +3656,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 898
         end_line: 900
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software;
@@ -3676,17 +3676,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '56.14'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 908
         end_line: 909
-        from_file:
+        matcher: 3-seq
+        score: '56.14'
         matched_length: 13
         match_coverage: '59.09'
-        matcher: 3-seq
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         matched_text: |
           license notice, but it is assumed that it
@@ -3695,17 +3695,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 916
         end_line: 917
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -3714,17 +3714,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 924
         end_line: 925
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -3734,17 +3734,17 @@ other_license_detections:
     license_expression_spdx: Artistic-1.0-Perl AND LicenseRef-scancode-public-domain AND (Artistic-2.0
       AND LicenseRef-scancode-public-domain-disclaimer)
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 939
         end_line: 943
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_12.RULE
         matched_text: |
           The license notice in the document is:
@@ -3752,17 +3752,17 @@ other_license_detections:
            When included as an integrated part of the Standard Distribution
            of Perl or of its documentation (printed or otherwise), this works is
            covered under Perl's Artistic License.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 946
         end_line: 950
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_286.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_286.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
         matched_text: |
           Irrespective of its distribution, all code examples here are in the public
@@ -3770,17 +3770,17 @@ other_license_detections:
            derivatives thereof in your own programs for fun or for profit as you
            see fit.  A simple comment in the code giving credit to the FAQ would
            be courteous but is not required.
-      - score: '100.0'
+      - license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 954
         end_line: 956
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-2.0 AND public-domain-disclaimer
-        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
         matched_text: |
           This document is available under the same terms as Perl itself. Code
@@ -3790,17 +3790,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 964
         end_line: 966
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software;
@@ -3810,17 +3810,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 973
         end_line: 974
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3829,17 +3829,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 981
         end_line: 982
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3848,17 +3848,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 998
         end_line: 999
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -3867,17 +3867,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1017
         end_line: 1018
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         matched_text: |
           This software is free software and can be modified and distributed under
@@ -3886,17 +3886,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1025
         end_line: 1026
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -3905,17 +3905,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1033
         end_line: 1034
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3924,17 +3924,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1042
         end_line: 1043
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3943,17 +3943,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1051
         end_line: 1052
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3962,17 +3962,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1060
         end_line: 1061
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3981,17 +3981,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1068
         end_line: 1069
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -4000,17 +4000,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1084
         end_line: 1085
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -4019,32 +4019,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1092
         end_line: 1093
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1095
         end_line: 1099
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_287.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_287.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
         matched_text: |
           Irrespective of its distribution, all code examples in these files
@@ -4056,17 +4056,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1107
         end_line: 1108
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -4075,17 +4075,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1114
         end_line: 1115
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -4094,17 +4094,17 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 1126
         end_line: 1128
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_154.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_154.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_154.RULE
         matched_text: |
           The file links to http://creativecommons.org/publicdomain/zero/1.0/
@@ -4114,17 +4114,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1136
         end_line: 1137
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed and/or
@@ -4133,17 +4133,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1144
         end_line: 1147
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_relevance: 99
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         matched_text: |
           There are no copyright notices this distribution.
@@ -4154,17 +4154,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
+        from_file:
         start_line: 1161
         end_line: 1167
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 61
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-2.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         matched_text: |
           This library is free software; you may redistribute it and/or modify
@@ -4178,17 +4178,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1181
         end_line: 1185
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 33
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -4200,17 +4200,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 1192
         end_line: 1193
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -4219,17 +4219,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1199
         end_line: 1200
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         matched_text: |
           This module is free software, you may distribute it under the same
@@ -4238,30 +4238,30 @@ other_license_detections:
   - license_expression: bsd-new AND (gpl-1.0-plus OR artistic-perl-1.0)
     license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl)
     matches:
-      - score: '99.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1209
         end_line: 1209
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1065.RULE
         rule_relevance: 99
+        rule_identifier: bsd-new_1065.RULE
         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
-      - score: '70.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1210
         end_line: 1211
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_relevance: 70
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         matched_text: |
           It is assumed that the other parts are licensed under the same
@@ -4270,17 +4270,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1219
         end_line: 1220
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -4289,34 +4289,34 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 1227
         end_line: 1227
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_14.RULE
         rule_relevance: 100
+        rule_identifier: unicode_14.RULE
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1237
         end_line: 1238
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -4325,17 +4325,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1249
         end_line: 1253
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         matched_text: |
           This module is free software; you may redistribute it and/or modify it
@@ -4347,17 +4347,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1263
         end_line: 1264
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4366,17 +4366,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1300
         end_line: 1301
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         matched_text: |
           There is no copyright or license information in these distributions.
@@ -4385,17 +4385,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1309
         end_line: 1310
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         matched_text: |
           This module is free software; you can redistribute and/or modify
@@ -4404,17 +4404,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1318
         end_line: 1319
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4423,17 +4423,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1326
         end_line: 1327
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -4442,17 +4442,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1335
         end_line: 1336
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -4462,32 +4462,32 @@ other_license_detections:
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND (GPL-1.0-or-later OR
       Artistic-1.0-Perl)
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1344
         end_line: 1345
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1347
         end_line: 1348
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         matched_text: |
           Perl 5
@@ -4496,17 +4496,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1355
         end_line: 1356
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4515,17 +4515,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 1362
         end_line: 1363
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -4534,17 +4534,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1371
         end_line: 1372
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -4553,17 +4553,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1379
         end_line: 1380
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         matched_text: |
           You can redistribute and/or modify this document under the same terms
@@ -4572,17 +4572,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1387
         end_line: 1388
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -4591,32 +4591,32 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1396
         end_line: 1397
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1400
         end_line: 1402
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         matched_text: |
           This module is distributed under the same terms as Perl itself.
@@ -4626,34 +4626,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1408
         end_line: 1408
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1415
         end_line: 1416
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4662,34 +4662,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1422
         end_line: 1422
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1429
         end_line: 1430
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -4698,34 +4698,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1437
         end_line: 1437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         matched_text: This program is distributed under the same terms as perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-2bcbbce8-54f0-bccc-2196-d6690e456d84
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1444
         end_line: 1445
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify it
@@ -4734,17 +4734,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1455
         end_line: 1456
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or
@@ -4753,17 +4753,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1463
         end_line: 1464
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4772,17 +4772,17 @@ other_license_detections:
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 1473
         end_line: 1479
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         matched_text: |
           The main license applies to most of the code:
@@ -4796,17 +4796,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1502
         end_line: 1503
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -4815,17 +4815,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1513
         end_line: 1514
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4834,17 +4834,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1522
         end_line: 1523
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4853,17 +4853,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1533
         end_line: 1534
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4872,17 +4872,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1543
         end_line: 1544
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4891,17 +4891,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1563
         end_line: 1564
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4910,17 +4910,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1573
         end_line: 1575
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 30
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         matched_text: |
           This package is free software and is provided "as is" without express
@@ -4930,17 +4930,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1585
         end_line: 1586
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4949,17 +4949,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1593
         end_line: 1594
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4968,17 +4968,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1602
         end_line: 1603
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4987,17 +4987,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1612
         end_line: 1613
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         matched_text: |
           There is no license information included. It is assumed that this
@@ -5006,17 +5006,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1620
         end_line: 1621
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5025,17 +5025,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1628
         end_line: 1629
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         matched_text: |
           This program is free software; you can redistribute and/or modify it
@@ -5044,17 +5044,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1636
         end_line: 1637
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -5063,17 +5063,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1644
         end_line: 1646
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         matched_text: |
           There is no license information included that clearly applies to the
@@ -5083,17 +5083,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1655
         end_line: 1655
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         matched_text: It is assumed that this file is licensed under the same terms as Perl
           itself.
@@ -5101,17 +5101,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1662
         end_line: 1663
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5120,17 +5120,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1670
         end_line: 1672
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         matched_text: |
           The license in the file is specified as
@@ -5140,17 +5140,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1679
         end_line: 1680
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -5159,34 +5159,34 @@ other_license_detections:
   - license_expression: artistic-1.0
     license_expression_spdx: Artistic-1.0
     matches:
-      - score: '90.0'
+      - license_expression: artistic-1.0
+        spdx_license_expression: Artistic-1.0
+        from_file:
         start_line: 1687
         end_line: 1687
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-1.0
-        spdx_license_expression: Artistic-1.0
-        rule_identifier: artistic-1.0_11.RULE
         rule_relevance: 90
+        rule_identifier: artistic-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE
         matched_text: the artistic license.
     identifier: artistic_1_0-2ff80857-def0-0ed3-86d0-f745062039f9
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1707
         end_line: 1708
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         matched_text: |
           There is no license information in this distribution.
@@ -5195,32 +5195,32 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1716
         end_line: 1717
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         matched_text: |
           As above, it is assumed that this file is licensed under the same terms
           as Perl itself.
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1725
         end_line: 1726
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -5229,17 +5229,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1733
         end_line: 1735
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5249,17 +5249,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1742
         end_line: 1743
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5268,17 +5268,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1751
         end_line: 1752
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5287,34 +5287,34 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 1758
         end_line: 1758
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_7.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_7.RULE
         matched_text: This program is distributed under the Artistic License.
     identifier: artistic_perl_1_0-2d6db20c-52be-912f-b056-8d081e123f91
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1764
         end_line: 1765
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_37.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_37.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_37.RULE
         matched_text: |
           There is no copyright or license information in this distribution.
@@ -5323,17 +5323,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1776
         end_line: 1777
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5342,17 +5342,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1787
         end_line: 1788
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5361,17 +5361,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1795
         end_line: 1796
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -5380,34 +5380,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1814
         end_line: 1814
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1821
         end_line: 1822
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         matched_text: |
           You can use and redistribute this document under the same terms as Perl
@@ -5416,32 +5416,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1833
         end_line: 1834
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1836
         end_line: 1840
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_286.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_286.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
         matched_text: |
           Irrespective of its distribution, all code examples here are in the public
@@ -5453,17 +5453,17 @@ other_license_detections:
   - license_expression: artistic-2.0 AND public-domain-disclaimer
     license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 1849
         end_line: 1851
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0 AND public-domain-disclaimer
-        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
         matched_text: |
           This document is available under the same terms as Perl itself. Code
@@ -5473,83 +5473,83 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1860
         end_line: 1860
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1869
         end_line: 1869
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1876
         end_line: 1876
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1886
         end_line: 1887
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1889
         end_line: 1893
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_287.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_287.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
         matched_text: |
           Irrespective of its distribution, all code examples in these files are
@@ -5561,17 +5561,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: '1908'
         end_line: '1909'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it under
@@ -5580,32 +5580,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: '1916'
         end_line: '1917'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: '1919'
         end_line: '1923'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_287.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_287.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
         matched_text: |
           Irrespective of its distribution, all code examples in these files are
@@ -5617,68 +5617,68 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: '1933'
         end_line: '1933'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: '1940'
         end_line: '1940'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: '1947'
         end_line: '1947'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: '1963'
         end_line: '1964'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -5687,18 +5687,18 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+          OR GPL-1.0-or-later
+        from_file:
         start_line: '1985'
         end_line: 2000
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 103
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         matched_text: |
           You may distribute the files contained in this distribution
@@ -5721,17 +5721,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
+        from_file:
         start_line: 2014
         end_line: 2016
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-dist-1.0
-        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
-        rule_identifier: artistic-dist-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_3.RULE
         matched_text: |
           This subdirectory contains unmodified 'dist' code that is
@@ -5741,17 +5741,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0 OR gpl-1.0-plus
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 2041
         end_line: 2065
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         matched_text: |
           dist is distributed under a modified version of the Perl Artistic License.
@@ -5783,17 +5783,17 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND mit
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 2072
         end_line: 2079
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 49
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -5804,34 +5804,34 @@ other_license_detections:
                 version, or
 
              b) the "Artistic License" which comes with Perl.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 2082
         end_line: 2082
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_577.RULE
         rule_relevance: 100
+        rule_identifier: mit_577.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_577.RULE
         matched_text: under the Expat license.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0__and_mit-96b88a5a-57e2-5b8b-99de-0b9196e7d3fc
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 2095
         end_line: 2098
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         matched_text: |
           may be redistributed
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 c5a3ebe5ed4..cc982ea5ade 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
@@ -36,30 +36,30 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 17
         end_line: 17
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 18
         end_line: 33
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_267.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_267.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_267.RULE
         matched_text: |
           The upstream license clarifies pretty well that the sources of pulseaudio are
@@ -78,17 +78,17 @@ license_detections:
               being LGPL licensed and the server part ('libpulsecore') as being GPL
               licensed. Since the PulseAudio daemon and the modules link to
               'libpulsecore' they are of course also GPL licensed.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 37
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_232.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_232.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_232.RULE
         matched_text: |
           On Debian systems, the complete text of the LGPL-2.1 can be found in
@@ -97,17 +97,17 @@ license_detections:
   - license_expression: sun-source
     license_expression_spdx: LicenseRef-scancode-sun-source
     matches:
-      - score: '100.0'
+      - license_expression: sun-source
+        spdx_license_expression: LicenseRef-scancode-sun-source
+        from_file:
         start_line: 44
         end_line: 62
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sun-source
-        spdx_license_expression: LicenseRef-scancode-sun-source
-        rule_identifier: sun-source_1.RULE
         rule_relevance: 100
+        rule_identifier: sun-source_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sun-source_1.RULE
         matched_text: |
           This source code is a product of Sun Microsystems, Inc. and is provided
@@ -133,17 +133,17 @@ license_detections:
   - license_expression: hpnd-pbmplus
     license_expression_spdx: HPND-Pbmplus
     matches:
-      - score: '100.0'
+      - license_expression: hpnd-pbmplus
+        spdx_license_expression: HPND-Pbmplus
+        from_file:
         start_line: 68
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hpnd-pbmplus
-        spdx_license_expression: HPND-Pbmplus
-        rule_identifier: hpnd-pbmplus.LICENSE
         rule_relevance: 100
+        rule_identifier: hpnd-pbmplus.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hpnd-pbmplus.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and its
@@ -156,17 +156,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 79
         end_line: 81
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -176,17 +176,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 87
         end_line: 89
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -196,17 +196,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 94
         end_line: 96
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -216,17 +216,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 102
         end_line: 104
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_266.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_266.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_266.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -236,17 +236,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 111
         end_line: 113
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_711.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_711.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_711.RULE
         matched_text: |
           License: GPL-2+
@@ -256,17 +256,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 120
         end_line: 122
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -276,17 +276,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 128
         end_line: 130
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -296,17 +296,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 137
         end_line: 139
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -316,17 +316,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 144
         end_line: 146
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -336,17 +336,17 @@ license_detections:
   - license_expression: adrian
     license_expression_spdx: LicenseRef-scancode-adrian
     matches:
-      - score: '100.0'
+      - license_expression: adrian
+        spdx_license_expression: LicenseRef-scancode-adrian
+        from_file:
         start_line: 152
         end_line: 159
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: adrian
-        spdx_license_expression: LicenseRef-scancode-adrian
-        rule_identifier: adrian.LICENSE
         rule_relevance: 100
+        rule_identifier: adrian.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/adrian.LICENSE
         matched_text: |
           You are allowed to use this source code in any open source or closed
@@ -361,17 +361,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 164
         end_line: 166
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -381,17 +381,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 171
         end_line: 173
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -401,17 +401,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 179
         end_line: 181
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -421,17 +421,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 187
         end_line: 189
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -441,17 +441,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: '195'
         end_line: '197'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -461,17 +461,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 203
         end_line: 205
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -481,17 +481,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 211
         end_line: 213
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -501,17 +501,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 219
         end_line: 221
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -521,17 +521,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 226
         end_line: 228
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -541,17 +541,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 235
         end_line: 237
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -561,17 +561,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 243
         end_line: 245
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -581,17 +581,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 251
         end_line: 253
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -601,17 +601,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 259
         end_line: 261
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -621,17 +621,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 266
         end_line: 268
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -641,17 +641,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 275
         end_line: 277
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -661,17 +661,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 283
         end_line: 285
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -681,17 +681,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 291
         end_line: 293
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -701,17 +701,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 299
         end_line: 317
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -737,17 +737,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 323
         end_line: 325
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -757,17 +757,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 332
         end_line: 334
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -777,17 +777,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 340
         end_line: 342
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -797,17 +797,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 347
         end_line: 349
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -817,17 +817,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 354
         end_line: 356
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -837,17 +837,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 363
         end_line: 365
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -857,17 +857,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 371
         end_line: 373
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_528.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_528.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_528.RULE
         matched_text: |
           License: LGPL-2+
@@ -877,17 +877,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 382
         end_line: 384
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -897,17 +897,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 389
         end_line: 391
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -917,17 +917,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 397
         end_line: 399
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -937,17 +937,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 405
         end_line: 407
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -957,17 +957,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 413
         end_line: 415
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -977,17 +977,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 422
         end_line: 424
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -997,17 +997,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 430
         end_line: 432
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1017,17 +1017,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 440
         end_line: 442
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1037,17 +1037,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 447
         end_line: 449
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1057,17 +1057,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 454
         end_line: 456
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1077,17 +1077,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 465
         end_line: 467
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1097,17 +1097,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 472
         end_line: 474
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1117,17 +1117,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 479
         end_line: 481
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1137,17 +1137,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 487
         end_line: 489
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1157,17 +1157,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 495
         end_line: 497
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1177,17 +1177,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 502
         end_line: 504
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1197,17 +1197,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 511
         end_line: 513
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1217,17 +1217,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 518
         end_line: 520
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1237,17 +1237,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 525
         end_line: 527
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1257,17 +1257,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 533
         end_line: 535
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1277,17 +1277,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 540
         end_line: 542
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1297,17 +1297,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 547
         end_line: 549
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1317,17 +1317,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 554
         end_line: 556
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1337,17 +1337,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 561
         end_line: 563
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1357,17 +1357,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 568
         end_line: 570
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1377,17 +1377,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 576
         end_line: 578
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_711.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_711.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_711.RULE
         matched_text: |
           License: GPL-2+
@@ -1397,17 +1397,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 585
         end_line: 587
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1417,17 +1417,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 594
         end_line: 596
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1437,33 +1437,33 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 602
         end_line: 604
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
            On Debian systems, the complete text of the LGPL-2.1 can be found in
            /usr/share/common-licenses/LGPL-2.1.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 608
         end_line: 610
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_231.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_231.RULE
         matched_text: |
           License: LGPL-2.1+
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 e03484654b1..57a4b1e2e28 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
@@ -34,30 +34,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 84
         end_line: 84
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 85
         end_line: 95
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,17 +71,17 @@ other_license_detections:
           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
           See the License for the specific language governing permissions and
           limitations under the License.
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 97
         end_line: 98
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_865.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_865.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_865.RULE
         matched_text: |
           On Debian systems, the complete text of the Apache version 2.0 license
@@ -90,17 +90,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 101
         end_line: 118
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -125,17 +125,17 @@ other_license_detections:
   - license_expression: psf-2.0
     license_expression_spdx: PSF-2.0
     matches:
-      - score: '89.1'
+      - license_expression: psf-2.0
+        spdx_license_expression: PSF-2.0
+        from_file:
         start_line: 121
         end_line: 169
-        from_file:
+        matcher: 3-seq
+        score: '89.1'
         matched_length: 327
         match_coverage: '89.1'
-        matcher: 3-seq
-        license_expression: psf-2.0
-        spdx_license_expression: PSF-2.0
-        rule_identifier: psf-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: psf-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/psf-2.0.LICENSE
         matched_text: |
           PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -191,17 +191,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 172
         end_line: '191'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_16.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_16.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -228,17 +228,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: '194'
         end_line: 217
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1072.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1072.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1072.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -269,17 +269,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 76
         end_line: 76
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_509.RULE
         rule_relevance: 99
+        rule_identifier: bsd-new_509.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_509.RULE
         matched_text: Software License Agreement (BSD License),
     identifier: bsd_new-a78c649f-fcdf-a1af-d0f9-463c2f476c05
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 12a7564f576..e1f186fa3a3 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: reportbug
     license_expression_spdx: LicenseRef-scancode-reportbug
     matches:
-      - score: '100.0'
+      - license_expression: reportbug
+        spdx_license_expression: LicenseRef-scancode-reportbug
+        from_file:
         start_line: 10
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: reportbug
-        spdx_license_expression: LicenseRef-scancode-reportbug
-        rule_identifier: reportbug_1.RULE
         rule_relevance: 100
+        rule_identifier: reportbug_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/reportbug_1.RULE
         matched_text: |
           License: other
@@ -41,17 +41,17 @@ license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 32
         end_line: 37
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 43
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl_77.RULE
         rule_relevance: 100
+        rule_identifier: gpl_77.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_77.RULE
         matched_text: |
           License: GPL-any
@@ -64,17 +64,17 @@ license_detections:
   - license_expression: reportbug AND gpl-2.0
     license_expression_spdx: LicenseRef-scancode-reportbug AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: reportbug
+        spdx_license_expression: LicenseRef-scancode-reportbug
+        from_file:
         start_line: 43
         end_line: 58
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: reportbug
-        spdx_license_expression: LicenseRef-scancode-reportbug
-        rule_identifier: reportbug_1.RULE
         rule_relevance: 100
+        rule_identifier: reportbug_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/reportbug_1.RULE
         matched_text: |
           License: other
@@ -93,17 +93,17 @@ license_detections:
               ##  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
               ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
               ##  SOFTWARE.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 61
         end_line: 61
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: GPL-2'
     identifier: reportbug_and_gpl_2_0-553a18d0-b340-e581-c21f-23bb6857b30a
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 a44c439602e..eb3c6067e33 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
@@ -11,17 +11,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 14
         end_line: 31
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
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 4893de6f96d..67bf644469d 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
@@ -11,17 +11,17 @@ other_license_detections:
   - license_expression: sendmail
     license_expression_spdx: Sendmail
     matches:
-      - score: '97.65'
+      - license_expression: sendmail
+        spdx_license_expression: Sendmail
+        from_file:
         start_line: '19'
         end_line: 99
-        from_file:
+        matcher: 3-seq
+        score: '97.65'
         matched_length: 582
         match_coverage: '97.65'
-        matcher: 3-seq
-        license_expression: sendmail
-        spdx_license_expression: Sendmail
-        rule_identifier: sendmail-2014.RULE
         rule_relevance: 100
+        rule_identifier: sendmail-2014.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sendmail-2014.RULE
         matched_text: |
           SENDMAIL LICENSE
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 273a405d7a8..9e7ef8704ff 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
@@ -35,34 +35,34 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 21
         end_line: 21
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_136.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_136.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE
         matched_text: license BSD-2-clause
     identifier: bsd_simplified-2383ae10-5494-e069-46c2-e2d6cb56951f
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 79
         end_line: 101
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -92,17 +92,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '98.88'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 106
         end_line: 124
-        from_file:
+        matcher: 2-aho
+        score: '98.88'
         matched_length: 176
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_274.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_274.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_274.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -128,17 +128,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 127
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -162,46 +162,46 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 145
         end_line: 145
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 148
         end_line: 150
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1142.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1142.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE
         matched_text: |
           free software, licensed under:
 
             The GNU General Public License, Version 2,
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 152
         end_line: 156
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 59
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1296.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -213,30 +213,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 158
         end_line: 158
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 159
         end_line: 173
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_839.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_839.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_839.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
@@ -258,30 +258,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.1
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 175
         end_line: 175
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 176
         end_line: 187
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
         matched_text: |
           This library is free software: you can redistribute it and/or modify
@@ -296,17 +296,17 @@ other_license_detections:
 
           You should have received a copy of the GNU Lesser General Public License
           along with this library.  If not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 189
         end_line: '190'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_293.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_293.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_293.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU Lesser General
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 321affd2a5a..e6c489cdfc9 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
@@ -34,17 +34,17 @@ other_license_detections:
   - license_expression: markus-kuhn-license
     license_expression_spdx: HPND-Markus-Kuhn
     matches:
-      - score: '100.0'
+      - license_expression: markus-kuhn-license
+        spdx_license_expression: HPND-Markus-Kuhn
+        from_file:
         start_line: 21
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: markus-kuhn-license
-        spdx_license_expression: HPND-Markus-Kuhn
-        rule_identifier: markus-kuhn-license.LICENSE
         rule_relevance: 100
+        rule_identifier: markus-kuhn-license.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/markus-kuhn-license.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
@@ -54,17 +54,17 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 33
         end_line: 34
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_323.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_323.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_323.RULE
         matched_text: |
           Permission is granted to everyone to use and distribute this work,
@@ -73,30 +73,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 78
         end_line: 78
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 79
         end_line: 80
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1325.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1325.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1325.RULE
         matched_text: |
           On Debian systems, the complete text of the GPL version 2 license can be
@@ -105,30 +105,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus AND gpl-3.0
     license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 82
         end_line: 82
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 83
         end_line: 84
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_480.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_480.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_480.RULE
         matched_text: |
           On Debian systems, the complete text of the GPL version 3 license can be
@@ -137,30 +137,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 86
         end_line: 86
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 87
         end_line: 102
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 119
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE
         matched_text: |
           Licensed to the Apache Software Foundation (ASF) under one
@@ -183,17 +183,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 107
         end_line: 131
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 204
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_970.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_970.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_970.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -225,17 +225,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 136
         end_line: 155
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without modification,
@@ -262,17 +262,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 158
         end_line: 174
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 177
         end_line: 208
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 328
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_56.RULE
         rule_relevance: 100
+        rule_identifier: unicode_56.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_56.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -345,17 +345,17 @@ other_license_detections:
   - license_expression: afl-3.0
     license_expression_spdx: AFL-3.0
     matches:
-      - score: '100.0'
+      - license_expression: afl-3.0
+        spdx_license_expression: AFL-3.0
+        from_file:
         start_line: 211
         end_line: 396
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1626
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: afl-3.0
-        spdx_license_expression: AFL-3.0
-        rule_identifier: afl-3.0.LICENSE
         rule_relevance: 100
+        rule_identifier: afl-3.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/afl-3.0.LICENSE
         matched_text: |
           This Academic Free License (the "License") applies to any original
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 dfd407fef80..d029766f5e3 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
@@ -31,17 +31,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 62
         end_line: 63
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
         matched_text: |
           You can use this free for any purpose. It's in the public domain. It has no
@@ -50,17 +50,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 114
         end_line: 130
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -84,30 +84,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 132
         end_line: 132
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 133
         end_line: 148
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1292.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -130,30 +130,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 150
         end_line: 150
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 151
         end_line: 166
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -176,30 +176,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 168
         end_line: 168
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 169
         end_line: 184
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -222,30 +222,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 186
         end_line: 186
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 187
         end_line: '195'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all copyright
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 b5184eac153..1b9ba023db6 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 9
         end_line: 9
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_285.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_285.RULE
         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.
     identifier: public_domain-66cbe544-bff0-b748-48f3-5ee40ae6ba61
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 b2e51b0349f..2a8432a85d3 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: info-zip-2009-01
     license_expression_spdx: LicenseRef-scancode-info-zip-2009-01
     matches:
-      - score: '100.0'
+      - license_expression: info-zip-2009-01
+        spdx_license_expression: LicenseRef-scancode-info-zip-2009-01
+        from_file:
         start_line: 15
         end_line: 76
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 527
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: info-zip-2009-01
-        spdx_license_expression: LicenseRef-scancode-info-zip-2009-01
-        rule_identifier: info-zip-2009-01_12.RULE
         rule_relevance: 100
+        rule_identifier: info-zip-2009-01_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/info-zip-2009-01_12.RULE
         matched_text: |
           This is version 2009-Jan-02 of the Info-ZIP license.
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 0cf15060b96..20665d3e91d 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
@@ -46,17 +46,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1015
         end_line: 1017
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_303.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_303.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
         matched_text: |
           This code was written by Colin Plumb in 1993, no copyright is
@@ -66,17 +66,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1045
         end_line: 1064
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_31.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_31.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_31.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -103,17 +103,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1067
         end_line: 1091
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1071.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1071.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1071.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -145,17 +145,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 1094
         end_line: 1112
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -181,17 +181,17 @@ other_license_detections:
   - license_expression: boost-1.0
     license_expression_spdx: BSL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: boost-1.0
+        spdx_license_expression: BSL-1.0
+        from_file:
         start_line: 1115
         end_line: 1138
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 202
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: boost-1.0
-        spdx_license_expression: BSL-1.0
-        rule_identifier: boost-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: boost-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person or
@@ -222,30 +222,30 @@ other_license_detections:
   - license_expression: lgpl-2.0 AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-only AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0
+        spdx_license_expression: LGPL-2.0-only
+        from_file:
         start_line: 1140
         end_line: 1140
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0
-        spdx_license_expression: LGPL-2.0-only
-        rule_identifier: lgpl-2.0_12.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE
         matched_text: 'License: lgpl-2'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1141
         end_line: 1150
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 81
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_527.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_527.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_527.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify
@@ -262,30 +262,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1152
         end_line: 1152
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1153
         end_line: 1163
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_526.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_526.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_526.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify
@@ -303,30 +303,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 1165
         end_line: 1165
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 1166
         end_line: 1175
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 83
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_382.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_382.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_382.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify
@@ -343,30 +343,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1177
         end_line: 1177
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1178
         end_line: 1188
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 94
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_202.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_202.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_202.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify
@@ -384,30 +384,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 1190
         end_line: 1190
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 1191
         end_line: 1201
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 91
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_655.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_655.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_655.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -425,30 +425,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1203
         end_line: 1203
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1204
         end_line: 1215
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 100
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_508.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_508.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_508.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -467,17 +467,17 @@ other_license_detections:
   - license_expression: x11
     license_expression_spdx: ICU
     matches:
-      - score: '100.0'
+      - license_expression: x11
+        spdx_license_expression: ICU
+        from_file:
         start_line: 1218
         end_line: 1241
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 227
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11
-        spdx_license_expression: ICU
-        rule_identifier: x11.LICENSE
         rule_relevance: 100
+        rule_identifier: x11.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -508,30 +508,30 @@ other_license_detections:
   - license_expression: mpl-1.1
     license_expression_spdx: MPL-1.1
     matches:
-      - score: '100.0'
+      - license_expression: mpl-1.1
+        spdx_license_expression: MPL-1.1
+        from_file:
         start_line: 1243
         end_line: 1243
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mpl-1.1
-        spdx_license_expression: MPL-1.1
-        rule_identifier: mpl-1.1_24.RULE
         rule_relevance: 100
+        rule_identifier: mpl-1.1_24.RULE
         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'
-      - score: '100.0'
+      - license_expression: mpl-1.1
+        spdx_license_expression: MPL-1.1
+        from_file:
         start_line: 1244
         end_line: 1710
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3710
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mpl-1.1
-        spdx_license_expression: MPL-1.1
-        rule_identifier: mpl-1.1.LICENSE
         rule_relevance: 100
+        rule_identifier: mpl-1.1.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mpl-1.1.LICENSE
         matched_text: |
           MOZILLA PUBLIC LICENSE
@@ -1005,30 +1005,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 1712
         end_line: 1712
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 1713
         end_line: 1714
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1018.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1018.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1018.RULE
         matched_text: |
           On Debian systems, the full text of the Apache license version 2 can
@@ -1037,17 +1037,17 @@ other_license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1717
         end_line: 1729
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -1067,17 +1067,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 9
         end_line: 9
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE
         rule_relevance: 100
+        rule_identifier: spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-2-clause_for_bsd-simplified.RULE
         matched_text: BSD 2-clause,
     identifier: bsd_simplified-7cacd81a-0bdb-1c32-cf2d-2250f633f213
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 d76e05959fb..c76bb14872e 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
@@ -9,30 +9,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 9
         end_line: 9
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 10
         end_line: 24
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_484.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_484.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_484.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
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 a797e02b482..3987bfd1bb7 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
@@ -31,17 +31,17 @@ other_license_detections:
   - license_expression: ssleay-windows
     license_expression_spdx: LicenseRef-scancode-ssleay-windows
     matches:
-      - score: '100.0'
+      - license_expression: ssleay-windows
+        spdx_license_expression: LicenseRef-scancode-ssleay-windows
+        from_file:
         start_line: 43
         end_line: 100
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 454
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ssleay-windows
-        spdx_license_expression: LicenseRef-scancode-ssleay-windows
-        rule_identifier: ssleay-windows_8.RULE
         rule_relevance: 100
+        rule_identifier: ssleay-windows_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ssleay-windows_8.RULE
         matched_text: |
           This package is an SSL implementation written
@@ -106,34 +106,34 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 105
         end_line: 105
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_125.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_125.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_125.RULE
         matched_text: 100% Public Domain,
     identifier: public_domain-febd716b-0a50-4cbc-9a5b-36698c14ffd8
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 116
         end_line: 126
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 96
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_1.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this
@@ -151,17 +151,17 @@ other_license_detections:
   - license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0
     license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0
+        spdx_license_expression: GPL-2.0-only WITH x11vnc-openssl-exception
+        from_file:
         start_line: 129
         end_line: 135
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 51
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0
-        spdx_license_expression: GPL-2.0-only WITH x11vnc-openssl-exception
-        rule_identifier: gpl-2.0_with_openssl-exception-gpl-2.0_9.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_with_openssl-exception-gpl-2.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_openssl-exception-gpl-2.0_9.RULE
         matched_text: |
           This program is released under the GNU General Public License (GPL),
@@ -175,30 +175,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 137
         end_line: 137
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 138
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1151.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1151.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1151.RULE
         matched_text: |
           This program is released under the GNU General Public License (GPL),
@@ -211,30 +211,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 145
         end_line: 145
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 146
         end_line: 152
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 50
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_841.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_841.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_841.RULE
         matched_text: |
           This program is released under the GNU General Public License (GPL),
@@ -248,30 +248,30 @@ other_license_detections:
   - license_expression: gpl-1.0-plus
     license_expression_spdx: GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 154
         end_line: 154
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl_72.RULE
         rule_relevance: 100
+        rule_identifier: gpl_72.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
         matched_text: 'License: gpl'
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 155
         end_line: 159
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_465.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_465.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_465.RULE
         matched_text: |
           This program is released under the GNU General Public License (GPL).
@@ -283,17 +283,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 163
         end_line: 179
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -317,17 +317,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 182
         end_line: 207
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -360,17 +360,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus AND zlib
     license_expression_spdx: GPL-1.0-or-later AND Zlib
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus AND zlib
+        spdx_license_expression: GPL-1.0-or-later AND Zlib
+        from_file:
         start_line: 35
         end_line: 36
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus AND zlib
-        spdx_license_expression: GPL-1.0-or-later AND Zlib
-        rule_identifier: gpl-1.0-plus_and_zlib_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_and_zlib_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_and_zlib_1.RULE
         matched_text: |
           released under
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 1f3ed374795..2cb40b5095e 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
@@ -10,17 +10,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 8
         end_line: 24
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -44,30 +44,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 29
         end_line: 29
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 30
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_846.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
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 e5f6ee2cf63..daaded87d27 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 20
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 114
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_68.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
         matched_text: |
           License:
@@ -35,17 +35,17 @@ license_detections:
               You should have received a copy of the GNU General Public License
               along with this package; if not, write to the Free Software
               Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
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 04500a63d3e..2e77c232150 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '97.67'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 14
         end_line: 31
-        from_file:
+        matcher: 3-seq
+        score: '97.67'
         matched_length: 168
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_x11-r75_58.RULE
         rule_relevance: 100
+        rule_identifier: mit_x11-r75_58.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_x11-r75_58.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -44,17 +44,17 @@ license_detections:
   - license_expression: amd-linux-firmware
     license_expression_spdx: LicenseRef-scancode-amd-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: amd-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-amd-linux-firmware
+        from_file:
         start_line: 38
         end_line: 86
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 427
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-amd-linux-firmware
-        rule_identifier: amd-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: amd-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/amd-linux-firmware.LICENSE
         matched_text: |
           REDISTRIBUTION: Permission is hereby granted, free of any license fees,
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 84220c4fdea..a505e57eb5b 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
@@ -18,17 +18,17 @@ license_detections:
   - license_expression: stmicroelectronics-linux-firmware
     license_expression_spdx: LicenseRef-scancode-stmicro-linux-firmware
     matches:
-      - score: '96.74'
+      - license_expression: stmicroelectronics-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-stmicro-linux-firmware
+        from_file:
         start_line: 12
         end_line: 46
-        from_file:
+        matcher: 3-seq
+        score: '96.74'
         matched_length: 267
         match_coverage: '96.74'
-        matcher: 3-seq
-        license_expression: stmicroelectronics-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-stmicro-linux-firmware
-        rule_identifier: stmicroelectronics-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: stmicroelectronics-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/stmicroelectronics-linux-firmware.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -72,17 +72,17 @@ license_detections:
     license_expression_spdx: BSD-3-Clause-Clear AND ISC AND LicenseRef-scancode-bsd-no-mod AND
       GPL-2.0-or-later WITH eCos-exception-2.0 AND MIT
     matches:
-      - score: '99.15'
+      - license_expression: clear-bsd
+        spdx_license_expression: BSD-3-Clause-Clear
+        from_file:
         start_line: 57
         end_line: 85
-        from_file:
+        matcher: 3-seq
+        score: '99.15'
         matched_length: 234
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: clear-bsd
-        spdx_license_expression: BSD-3-Clause-Clear
-        rule_identifier: clear-bsd_3.RULE
         rule_relevance: 100
+        rule_identifier: clear-bsd_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/clear-bsd_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -114,17 +114,17 @@ license_detections:
           WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 87
         end_line: 97
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc.LICENSE
         rule_relevance: 100
+        rule_identifier: isc.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for any
@@ -138,17 +138,17 @@ license_detections:
           WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
           ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
           OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-      - score: '100.0'
+      - license_expression: bsd-no-mod
+        spdx_license_expression: LicenseRef-scancode-bsd-no-mod
+        from_file:
         start_line: 99
         end_line: 128
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 231
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-no-mod
-        spdx_license_expression: LicenseRef-scancode-bsd-no-mod
-        rule_identifier: bsd-no-mod.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-no-mod.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-no-mod.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -181,17 +181,17 @@ 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 DAMAGES.
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH ecos-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH eCos-exception-2.0
+        from_file:
         start_line: 130
         end_line: 142
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus WITH ecos-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH eCos-exception-2.0
-        rule_identifier: gpl-2.0-plus_with_ecos-exception-2.0_25.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_ecos-exception-2.0_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ecos-exception-2.0_25.RULE
         matched_text: |
           eCos is free software; you can redistribute it and/or modify it under
@@ -207,17 +207,17 @@ 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.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 144
         end_line: 161
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -242,17 +242,17 @@ license_detections:
   - license_expression: qca-linux-firmware
     license_expression_spdx: LicenseRef-scancode-qca-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: qca-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-qca-linux-firmware
+        from_file:
         start_line: 205
         end_line: 248
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 390
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: qca-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-qca-linux-firmware
-        rule_identifier: qca-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: qca-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qca-linux-firmware.LICENSE
         matched_text: |
           Redistribution. Reproduction and redistribution in binary form, without
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 5cd2e618b4b..01794b76c22 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '87.5'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 4
         end_line: 9
-        from_file:
+        matcher: 3-seq
+        score: '87.5'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_599.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_599.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_599.RULE
         matched_text: |
           This file contains firmware data derived from proprietary unpublished
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 597010f84a6..310294251f6 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '87.5'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 6
         end_line: 11
-        from_file:
+        matcher: 3-seq
+        score: '87.5'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_599.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_599.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_599.RULE
         matched_text: |
           This file contains firmware data derived from proprietary unpublished
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 337f89c4bd3..8c3745f5542 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: broadcom-proprietary
     license_expression_spdx: LicenseRef-scancode-broadcom-proprietary
     matches:
-      - score: '100.0'
+      - license_expression: broadcom-proprietary
+        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
+        from_file:
         start_line: 4
         end_line: 207
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 1770
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: broadcom-proprietary
-        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
-        rule_identifier: broadcom-proprietary_1.RULE
         rule_relevance: 100
+        rule_identifier: broadcom-proprietary_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/broadcom-proprietary_1.RULE
         matched_text: "SOFTWARE LICENSE AGREEMENT\n\nUnless you and Broadcom Corporation (“Broadcom”)\
           \ execute a separate written\nsoftware license agreement governing use of the accompanying\
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 6cc3085b8e4..2bb4887b8b3 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: cavium-linux-firmware
     license_expression_spdx: LicenseRef-scancode-cavium-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: cavium-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-cavium-linux-firmware
+        from_file:
         start_line: 6
         end_line: 62
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 541
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cavium-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-cavium-linux-firmware
-        rule_identifier: cavium-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: cavium-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/cavium-linux-firmware.LICENSE
         matched_text: |
           Software License Agreement
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 12598c10056..3a3f82863b2 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
@@ -18,17 +18,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '100.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 11
         end_line: 46
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 295
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel.LICENSE
         rule_relevance: 100
+        rule_identifier: intel.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -71,17 +71,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '95.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 53
         end_line: 87
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 268
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel_2.RULE
         rule_relevance: 95
+        rule_identifier: intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
         matched_text: |
           Redistribution.
@@ -129,17 +129,17 @@ license_detections:
       AND BSD-2-Clause AND LicenseRef-scancode-x11-hanson AND LicenseRef-scancode-delorie-historical
       AND LicenseRef-scancode-intel-osl-1993
     matches:
-      - score: '95.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 101
         end_line: 135
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 268
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel_2.RULE
         rule_relevance: 95
+        rule_identifier: intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
         matched_text: |
           Redistribution.
@@ -177,17 +177,17 @@ license_detections:
           CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 139
         end_line: 143
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 48
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: license-intro_55.RULE
         rule_relevance: 100
+        rule_identifier: license-intro_55.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_55.RULE
         matched_text: |
           The newlib subdirectory is a collection of software from several sources.
@@ -195,17 +195,17 @@ license_detections:
           Each file may have its own copyright/license that is embedded in the source
           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:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 149
         end_line: 158
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 103
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_newlib.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_newlib.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_newlib.RULE
         matched_text: |
           This copyrighted material is made available to anyone wishing to use,
@@ -218,17 +218,17 @@ license_detections:
           incorporated in the source code or documentation are not subject to
           the BSD License and may only be used or replicated with the express
           permission of Red Hat, Inc.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 165
         end_line: 186
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_newlib3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_newlib3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_newlib3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without modification,
@@ -253,17 +253,17 @@ license_detections:
           WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: x11-lucent
+        spdx_license_expression: dtoa
+        from_file:
         start_line: '194'
         end_line: 203
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 93
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-lucent
-        spdx_license_expression: dtoa
-        rule_identifier: x11-lucent.RULE
         rule_relevance: 100
+        rule_identifier: x11-lucent.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -276,17 +276,17 @@ license_detections:
           WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
           REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
           OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-      - score: '100.0'
+      - license_expression: standard-ml-nj
+        spdx_license_expression: SMLNJ
+        from_file:
         start_line: 212
         end_line: 229
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 151
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: standard-ml-nj
-        spdx_license_expression: SMLNJ
-        rule_identifier: standard-ml-nj_3.RULE
         rule_relevance: 100
+        rule_identifier: standard-ml-nj_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/standard-ml-nj_3.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -307,17 +307,17 @@ license_detections:
           IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
           ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
           THIS SOFTWARE.
-      - score: '100.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 236
         end_line: 247
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 98
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
         matched_text: |
           This software is the property of Advanced Micro Devices, Inc  (AMD)  which
@@ -332,33 +332,33 @@ license_detections:
 
           So that all may benefit from your experience, please report  any  problems
           or  suggestions about this software
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 266
         end_line: 268
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
           Permission to use, copy, modify, and distribute this
           software is freely granted, provided that this notice is preserved.
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 274
         end_line: 283
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -371,17 +371,17 @@ license_detections:
           of the software without specific, written prior permission.
           Hewlett-Packard Company makes no representations about the
           suitability of this software for any purpose.
-      - score: '100.0'
+      - license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
+        from_file:
         start_line: 289
         end_line: 296
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 55
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nilsson-historical
-        spdx_license_expression: LicenseRef-scancode-nilsson-historical
-        rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: nilsson-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software is
@@ -392,17 +392,17 @@ license_detections:
           IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
           WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
           PURPOSE.
-      - score: '100.0'
+      - license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
+        from_file:
         start_line: 302
         end_line: 310
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: newlib-historical
-        spdx_license_expression: LicenseRef-scancode-newlib-historical
-        rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: newlib-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
         matched_text: |
           The authors hereby grant permission to use, copy, modify, distribute,
@@ -414,17 +414,17 @@ license_detections:
           and need not follow the licensing terms described here, provided that
           the new terms are clearly indicated on the first page of each file where
           they apply.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 317
         end_line: 337
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -448,17 +448,17 @@ license_detections:
           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '95.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 343
         end_line: 354
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 95
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical4.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
         matched_text: |
           This software is the property of SuperH, Inc (SuperH) which specifically
@@ -473,17 +473,17 @@ license_detections:
 
           So that all may benefit from your experience, please report any problems
           or suggestions about this software to the
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 369
         end_line: 394
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -512,17 +512,17 @@ license_detections:
           WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 401
         end_line: 420
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -545,17 +545,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 427
         end_line: 446
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 181
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_newlib3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -578,17 +578,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 453
         end_line: 472
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -611,17 +611,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '99.0'
+      - license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
+        from_file:
         start_line: 480
         end_line: 489
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 89
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-hanson
-        spdx_license_expression: LicenseRef-scancode-x11-hanson
-        rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
+        rule_identifier: x11-hanson2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -634,17 +634,17 @@ license_detections:
           WARRANTY.  IN PARTICULAR,  THE AUTHOR MAKES NO REPRESENTATION
           OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
           SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 496
         end_line: 515
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -667,17 +667,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 522
         end_line: 542
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_76.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -701,17 +701,17 @@ license_detections:
           WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: delorie-historical
+        spdx_license_expression: LicenseRef-scancode-delorie-historical
+        from_file:
         start_line: 548
         end_line: 553
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 45
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: delorie-historical
-        spdx_license_expression: LicenseRef-scancode-delorie-historical
-        rule_identifier: delorie-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: delorie-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/delorie-historical.LICENSE
         matched_text: |
           Redistribution, modification, and use in source and binary forms is permitted
@@ -720,17 +720,17 @@ license_detections:
 
           This file is distributed WITHOUT ANY WARRANTY; without even the implied
           warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-      - score: '100.0'
+      - license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
+        from_file:
         start_line: 563
         end_line: 585
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel-osl-1993
-        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
-        rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
+        rule_identifier: intel-osl-1993.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
         matched_text: |
           Intel hereby grants you permission to copy, modify, and distribute this
@@ -756,17 +756,17 @@ license_detections:
           LOSS OF PROFITS, INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES
           OF ANY KIND.  IN NO EVENT SHALL INTEL'S TOTAL LIABILITY EXCEED THE SUM
           PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER.
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 591
         end_line: 600
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -779,17 +779,17 @@ license_detections:
           of the software without specific, written prior permission.
           Hewlett-Packard Company makes no representations about the
           suitability of this software for any purpose.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 609
         end_line: 628
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -812,17 +812,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 635
         end_line: 654
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -845,17 +845,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 663
         end_line: 682
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -878,17 +878,17 @@ license_detections:
           LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 693
         end_line: 715
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_206.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_206.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -914,17 +914,17 @@ license_detections:
             CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 723
         end_line: 742
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 179
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_8.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_8.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -947,17 +947,17 @@ license_detections:
             LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 749
         end_line: 768
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -980,17 +980,17 @@ license_detections:
             LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 775
         end_line: 794
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 181
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_newlib3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1013,17 +1013,17 @@ license_detections:
             LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 801
         end_line: 820
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_newlib5.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_newlib5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib5.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1046,17 +1046,17 @@ license_detections:
             LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 827
         end_line: 846
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1079,17 +1079,17 @@ license_detections:
            LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 854
         end_line: 875
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_183.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_183.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_183.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1114,17 +1114,17 @@ license_detections:
            LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 881
         end_line: 906
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_412.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_412.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_412.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1153,17 +1153,17 @@ license_detections:
           LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 914
         end_line: 941
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_517.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_517.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_517.RULE
         matched_text: |
           Redistribution and  use in source  and binary forms, with  or without
@@ -1194,17 +1194,17 @@ license_detections:
            THEORY OF  LIABILITY, WHETHER IN CONTRACT, STRICT  LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
+        from_file:
         start_line: 947
         end_line: 955
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: newlib-historical
-        spdx_license_expression: LicenseRef-scancode-newlib-historical
-        rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: newlib-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
         matched_text: |
           The authors hereby grant permission to use, copy, modify, distribute,
@@ -1216,17 +1216,17 @@ license_detections:
           and need not follow the licensing terms described here, provided that
           the new terms are clearly indicated on the first page of each file where
           they apply.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 962
         end_line: 982
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_979.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_979.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_979.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1250,17 +1250,17 @@ license_detections:
           CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
           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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 989
         end_line: 1012
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 218
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_410.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_410.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_410.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1287,17 +1287,17 @@ license_detections:
           ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1019
         end_line: 1038
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 c41d0dc06de..378497f4417 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '95.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 8
         end_line: 46
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 268
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel_2.RULE
         rule_relevance: 95
+        rule_identifier: intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
         matched_text: "Redistribution.  \n\nRedistribution and use in binary form, without modification,\
           \ are\npermitted provided that the following conditions are met:\n\n * Redistributions\
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 1253632d403..2ad1a5ef4bb 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 7
         end_line: 332
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2975
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_521.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_521.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_521.RULE
         matched_text: "TERMS AND CONDITIONS\n    IMPORTANT - PLEASE READ BEFORE INSTALLING OR\
           \ USING THIS INTEL(C) SOFTWARE\n\nDo not use or load this firmware (the \"Software\"\
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 c3fbf6bf254..1db6a6ce74c 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: hauppauge-firmware-oem
     license_expression_spdx: LicenseRef-scancode-hauppauge-firmware-oem
     matches:
-      - score: '100.0'
+      - license_expression: hauppauge-firmware-oem
+        spdx_license_expression: LicenseRef-scancode-hauppauge-firmware-oem
+        from_file:
         start_line: 6
         end_line: 154
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 1277
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hauppauge-firmware-oem
-        spdx_license_expression: LicenseRef-scancode-hauppauge-firmware-oem
-        rule_identifier: hauppauge-firmware-oem.LICENSE
         rule_relevance: 100
+        rule_identifier: hauppauge-firmware-oem.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hauppauge-firmware-oem.LICENSE
         matched_text: |
           OEM/IHV/ISV FIRMWARE LICENSE AGREEMENT
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 3c896c0e41f..f0f99a1ea9d 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '100.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 7
         end_line: 42
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 295
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel.LICENSE
         rule_relevance: 100
+        rule_identifier: intel.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
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 8352d1546b1..3c1e0d03bd3 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '96.37'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 11
         end_line: 48
-        from_file:
+        matcher: 3-seq
+        score: '96.37'
         matched_length: 292
         match_coverage: '96.37'
-        matcher: 3-seq
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_319.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_319.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_319.RULE
         matched_text: |
           Redistribution. Redistribution and use in binary form, without
@@ -64,17 +64,17 @@ license_detections:
   - license_expression: marvell-firmware
     license_expression_spdx: LicenseRef-scancode-marvell-firmware
     matches:
-      - score: '100.0'
+      - license_expression: marvell-firmware
+        spdx_license_expression: LicenseRef-scancode-marvell-firmware
+        from_file:
         start_line: 55
         end_line: 84
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 242
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: marvell-firmware
-        spdx_license_expression: LicenseRef-scancode-marvell-firmware
-        rule_identifier: marvell-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: marvell-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/marvell-firmware.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
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 e5f6ee2cf63..daaded87d27 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 20
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 114
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_68.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
         matched_text: |
           License:
@@ -35,17 +35,17 @@ license_detections:
               You should have received a copy of the GNU General Public License
               along with this package; if not, write to the Free Software
               Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
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 e5f6ee2cf63..daaded87d27 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 20
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 114
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_68.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
         matched_text: |
           License:
@@ -35,17 +35,17 @@ license_detections:
               You should have received a copy of the GNU General Public License
               along with this package; if not, write to the Free Software
               Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
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 826e258d14c..b2f2ae6bbbb 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
@@ -58,17 +58,17 @@ license_detections:
   - license_expression: 3com-microcode
     license_expression_spdx: LicenseRef-scancode-3com-microcode
     matches:
-      - score: '100.0'
+      - license_expression: 3com-microcode
+        spdx_license_expression: LicenseRef-scancode-3com-microcode
+        from_file:
         start_line: 11
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 264
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: 3com-microcode
-        spdx_license_expression: LicenseRef-scancode-3com-microcode
-        rule_identifier: 3com-microcode3.RULE
         rule_relevance: 100
+        rule_identifier: 3com-microcode3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/3com-microcode3.RULE
         matched_text: |
           Redistribution and use in source and binary forms of the 3c990img.h
@@ -103,17 +103,17 @@ license_detections:
   - license_expression: bsd-simplified-source
     license_expression_spdx: LicenseRef-scancode-bsd-simplified-source
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified-source
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
+        from_file:
         start_line: 46
         end_line: 49
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 30
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified-source
-        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
-        rule_identifier: bsd-simplified-source.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified-source.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-source.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -124,17 +124,17 @@ license_detections:
   - license_expression: agere-bsd
     license_expression_spdx: LicenseRef-scancode-agere-bsd
     matches:
-      - score: '100.0'
+      - license_expression: agere-bsd
+        spdx_license_expression: LicenseRef-scancode-agere-bsd
+        from_file:
         start_line: 56
         end_line: 92
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 296
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: agere-bsd
-        spdx_license_expression: LicenseRef-scancode-agere-bsd
-        rule_identifier: agere-bsd_1.RULE
         rule_relevance: 100
+        rule_identifier: agere-bsd_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agere-bsd_1.RULE
         matched_text: |
           This software is provided subject to the following terms and conditions,
@@ -178,17 +178,17 @@ license_detections:
   - license_expression: x11-acer
     license_expression_spdx: LicenseRef-scancode-x11-acer
     matches:
-      - score: '100.0'
+      - license_expression: x11-acer
+        spdx_license_expression: LicenseRef-scancode-x11-acer
+        from_file:
         start_line: 97
         end_line: 109
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-acer
-        spdx_license_expression: LicenseRef-scancode-x11-acer
-        rule_identifier: x11-acer.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-acer.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-acer.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for
@@ -208,17 +208,17 @@ license_detections:
   - license_expression: ctl-linux-firmware
     license_expression_spdx: LicenseRef-scancode-ctl-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: ctl-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-ctl-linux-firmware
+        from_file:
         start_line: 116
         end_line: 159
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 364
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ctl-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-ctl-linux-firmware
-        rule_identifier: ctl-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: ctl-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ctl-linux-firmware.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -269,17 +269,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 164
         end_line: 166
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware
@@ -289,17 +289,17 @@ license_detections:
   - license_expression: linux-openib
     license_expression_spdx: Linux-OpenIB
     matches:
-      - score: '100.0'
+      - license_expression: linux-openib
+        spdx_license_expression: Linux-OpenIB
+        from_file:
         start_line: 173
         end_line: '193'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: linux-openib
-        spdx_license_expression: Linux-OpenIB
-        rule_identifier: linux-openib.LICENSE
         rule_relevance: 100
+        rule_identifier: linux-openib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-openib.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or
@@ -327,17 +327,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 200
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '199'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_334.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_334.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_334.RULE
         matched_text: |
           Redistribution and use in binary form, without modification, are
@@ -368,17 +368,17 @@ license_detections:
   - license_expression: bsd-simplified-source
     license_expression_spdx: LicenseRef-scancode-bsd-simplified-source
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified-source
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
+        from_file:
         start_line: 228
         end_line: 231
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 30
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified-source
-        spdx_license_expression: LicenseRef-scancode-bsd-simplified-source
-        rule_identifier: bsd-simplified-source.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified-source.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-source.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -389,17 +389,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 236
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 120
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_332.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_332.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_332.RULE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software, only
@@ -418,17 +418,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 252
         end_line: 264
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc.LICENSE
         rule_relevance: 100
+        rule_identifier: isc.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for
@@ -448,17 +448,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 269
         end_line: 281
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc.LICENSE
         rule_relevance: 100
+        rule_identifier: isc.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for
@@ -478,17 +478,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 286
         end_line: 293
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_331.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_331.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_331.RULE
         matched_text: |
           TERRATEC grants permission to use and redistribute these firmware
@@ -503,17 +503,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 300
         end_line: 323
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_786.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_786.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_786.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -544,17 +544,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 328
         end_line: 339
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc.LICENSE
         rule_relevance: 100
+        rule_identifier: isc.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/isc.LICENSE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for any
@@ -573,17 +573,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 344
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_330.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_330.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_330.RULE
         matched_text: |
           Sensoray grants permission to use and redistribute these firmware
@@ -597,17 +597,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 355
         end_line: 363
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 73
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_328.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_328.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_328.RULE
         matched_text: |
           The firmware files included in the firmware/ directory may be freely
@@ -623,17 +623,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '95.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 370
         end_line: 403
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 268
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel_2.RULE
         rule_relevance: 95
+        rule_identifier: intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_2.RULE
         matched_text: |
           Redistribution.
@@ -674,17 +674,17 @@ license_detections:
   - license_expression: nxp-firmware-patent
     license_expression_spdx: LicenseRef-scancode-nxp-firmware-patent
     matches:
-      - score: '100.0'
+      - license_expression: nxp-firmware-patent
+        spdx_license_expression: LicenseRef-scancode-nxp-firmware-patent
+        from_file:
         start_line: 414
         end_line: 457
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 384
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nxp-firmware-patent
-        spdx_license_expression: LicenseRef-scancode-nxp-firmware-patent
-        rule_identifier: nxp-firmware-patent.LICENSE
         rule_relevance: 100
+        rule_identifier: nxp-firmware-patent.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nxp-firmware-patent.LICENSE
         matched_text: |
           Redistribution. Reproduction and redistribution in binary form, without
@@ -735,17 +735,17 @@ license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 462
         end_line: 487
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 233
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_44.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_44.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -778,17 +778,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '98.77'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 494
         end_line: 510
-        from_file:
+        matcher: 3-seq
+        score: '98.77'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_712.RULE
         rule_relevance: 100
+        rule_identifier: mit_712.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_712.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -812,17 +812,17 @@ license_detections:
   - license_expression: moxa-linux-firmware
     license_expression_spdx: LicenseRef-scancode-moxa-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: moxa-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-moxa-linux-firmware
+        from_file:
         start_line: 515
         end_line: 530
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: moxa-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-moxa-linux-firmware
-        rule_identifier: moxa-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: moxa-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/moxa-linux-firmware.LICENSE
         matched_text: |
           The software accompanying this license statement (the “Software”)
@@ -845,17 +845,17 @@ license_detections:
   - license_expression: ralink-firmware
     license_expression_spdx: LicenseRef-scancode-ralink-firmware
     matches:
-      - score: '100.0'
+      - license_expression: ralink-firmware
+        spdx_license_expression: LicenseRef-scancode-ralink-firmware
+        from_file:
         start_line: 537
         end_line: 572
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 297
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ralink-firmware
-        spdx_license_expression: LicenseRef-scancode-ralink-firmware
-        rule_identifier: ralink-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: ralink-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ralink-firmware.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -898,34 +898,34 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 577
         end_line: 577
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_324.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_324.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_324.RULE
         matched_text: All firmware components are redistributable in binary form.
     identifier: proprietary_license-fb7f18e9-048a-60a6-5671-b183fa33d6f6
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 582
         end_line: 708
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 956
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_325.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_325.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_325.RULE
         matched_text: |
           IMPORTANT NOTICE -- READ CAREFULLY: This License For Customer Use of
@@ -1059,17 +1059,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 719
         end_line: 756
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 303
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_319.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_319.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_319.RULE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -1114,17 +1114,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 761
         end_line: 768
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_311.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_311.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_311.RULE
         matched_text: |
           Comtrol grants permission to use and redistribute these firmware
@@ -1139,17 +1139,17 @@ license_detections:
   - license_expression: ralink-firmware
     license_expression_spdx: LicenseRef-scancode-ralink-firmware
     matches:
-      - score: '100.0'
+      - license_expression: ralink-firmware
+        spdx_license_expression: LicenseRef-scancode-ralink-firmware
+        from_file:
         start_line: 775
         end_line: 810
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 297
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ralink-firmware
-        spdx_license_expression: LicenseRef-scancode-ralink-firmware
-        rule_identifier: ralink-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: ralink-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ralink-firmware.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -1192,17 +1192,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 815
         end_line: 817
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware
@@ -1212,17 +1212,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 822
         end_line: 824
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware
@@ -1232,17 +1232,17 @@ license_detections:
   - license_expression: bsd-new AND proprietary-license
     license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new AND proprietary-license
+        spdx_license_expression: BSD-3-Clause AND LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 829
         end_line: 861
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 266
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new AND proprietary-license
-        spdx_license_expression: BSD-3-Clause AND LicenseRef-scancode-proprietary-license
-        rule_identifier: bsd-new_and_proprietary-license_1.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_and_proprietary-license_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1282,17 +1282,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 865
         end_line: 871
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_308.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_308.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_308.RULE
         matched_text: |
           Conexant grants permission to use and redistribute these firmware
@@ -1306,17 +1306,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '100.0'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 876
         end_line: 911
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 295
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel.LICENSE
         rule_relevance: 100
+        rule_identifier: intel.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel.LICENSE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
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 85257bc647c..290f4c8ba51 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-source-code
     license_expression_spdx: BSD-Source-Code
     matches:
-      - score: '99.46'
+      - license_expression: bsd-source-code
+        spdx_license_expression: BSD-Source-Code
+        from_file:
         start_line: 7
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '99.46'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-source-code
-        spdx_license_expression: BSD-Source-Code
-        rule_identifier: bsd-source-code_8.RULE
         rule_relevance: 100
+        rule_identifier: bsd-source-code_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-source-code_8.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 e531afa2a72..4195aecdd0a 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: netronome-firmware
     license_expression_spdx: LicenseRef-scancode-netronome-firmware
     matches:
-      - score: '100.0'
+      - license_expression: netronome-firmware
+        spdx_license_expression: LicenseRef-scancode-netronome-firmware
+        from_file:
         start_line: 6
         end_line: 68
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 545
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: netronome-firmware
-        spdx_license_expression: LicenseRef-scancode-netronome-firmware
-        rule_identifier: netronome-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: netronome-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/netronome-firmware.LICENSE
         matched_text: |
           Agilio(r) Firmware License Agreement (the "AGREEMENT")
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 38d3bec9242..796442203c9 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: qlogic-firmware
     license_expression_spdx: LicenseRef-scancode-qlogic-firmware
     matches:
-      - score: '100.0'
+      - license_expression: qlogic-firmware
+        spdx_license_expression: LicenseRef-scancode-qlogic-firmware
+        from_file:
         start_line: 7
         end_line: 34
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 262
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: qlogic-firmware
-        spdx_license_expression: LicenseRef-scancode-qlogic-firmware
-        rule_identifier: qlogic-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: qlogic-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qlogic-firmware.LICENSE
         matched_text: "Redistribution and use in binary form, without modification, for use\
           \ in conjunction\nwith QLogic authorized products is permitted provided that the following\
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 4cda58a368e..d583474998e 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
@@ -16,17 +16,17 @@ license_detections:
   - license_expression: qti-linux-firmware
     license_expression_spdx: LicenseRef-scancode-qti-linux-firmware
     matches:
-      - score: '100.0'
+      - license_expression: qti-linux-firmware
+        spdx_license_expression: LicenseRef-scancode-qti-linux-firmware
+        from_file:
         start_line: 6
         end_line: 211
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2208
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: qti-linux-firmware
-        spdx_license_expression: LicenseRef-scancode-qti-linux-firmware
-        rule_identifier: qti-linux-firmware.LICENSE
         rule_relevance: 100
+        rule_identifier: qti-linux-firmware.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qti-linux-firmware.LICENSE
         matched_text: |
           PLEASE READ THIS LICENSE AGREEMENT ("AGREEMENT") CAREFULLY.  THIS AGREEMENT IS
@@ -239,17 +239,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '44.44'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 231
         end_line: 234
-        from_file:
+        matcher: 3-seq
+        score: '44.44'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_557.RULE
         rule_relevance: 50
+        rule_identifier: proprietary-license_557.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_557.RULE
         matched_text: |
           is a trademark of Qualcomm Incorporated, registered in the
@@ -260,17 +260,17 @@ license_detections:
   - license_expression: openssl-ssleay
     license_expression_spdx: OpenSSL
     matches:
-      - score: '100.0'
+      - license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
+        from_file:
         start_line: 240
         end_line: 244
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openssl-ssleay
-        spdx_license_expression: OpenSSL
-        rule_identifier: openssl-ssleay_43.RULE
         rule_relevance: 100
+        rule_identifier: openssl-ssleay_43.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE
         matched_text: |
           The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
@@ -278,34 +278,34 @@ license_detections:
             See below for the actual license texts. Actually both licenses are BSD-style
             Open Source licenses. In case of any license issues related to OpenSSL
             please contact openssl-core@openssl.org.
-      - score: '100.0'
+      - license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
+        from_file:
         start_line: 246
         end_line: 246
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openssl-ssleay
-        spdx_license_expression: OpenSSL
-        rule_identifier: openssl-ssleay_2.RULE
         rule_relevance: 100
+        rule_identifier: openssl-ssleay_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE
         matched_text: OpenSSL License
     identifier: openssl_ssleay-cbfdb9fc-932d-b226-10aa-6aeea27f1ff9
   - license_expression: openssl
     license_expression_spdx: LicenseRef-scancode-openssl
     matches:
-      - score: '100.0'
+      - license_expression: openssl
+        spdx_license_expression: LicenseRef-scancode-openssl
+        from_file:
         start_line: 252
         end_line: 299
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 332
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openssl
-        spdx_license_expression: LicenseRef-scancode-openssl
-        rule_identifier: openssl_1.RULE
         rule_relevance: 100
+        rule_identifier: openssl_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -360,17 +360,17 @@ license_detections:
   - license_expression: ssleay-windows
     license_expression_spdx: LicenseRef-scancode-ssleay-windows
     matches:
-      - score: '100.0'
+      - license_expression: ssleay-windows
+        spdx_license_expression: LicenseRef-scancode-ssleay-windows
+        from_file:
         start_line: 309
         end_line: 360
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 453
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ssleay-windows
-        spdx_license_expression: LicenseRef-scancode-ssleay-windows
-        rule_identifier: ssleay-windows.LICENSE
         rule_relevance: 100
+        rule_identifier: ssleay-windows.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE
         matched_text: |
           This package is an SSL implementation written
@@ -429,34 +429,34 @@ license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 371
         end_line: 371
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_5.RULE
         rule_relevance: 100
+        rule_identifier: zlib_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE
         matched_text: For conditions of distribution and use, see copyright notice in zlib.h
     identifier: zlib-27de81f4-f6ce-2bf5-ab37-9a4c71f4b296
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 380
         end_line: 396
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_17.RULE
         rule_relevance: 100
+        rule_identifier: zlib_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -480,17 +480,17 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 413
         end_line: 415
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_303.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_303.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
         matched_text: |
           This code was
@@ -500,17 +500,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 439
         end_line: 461
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_68.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_68.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_68.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -540,17 +540,17 @@ license_detections:
   - license_expression: gary-s-brown
     license_expression_spdx: LicenseRef-scancode-gary-s-brown
     matches:
-      - score: '100.0'
+      - license_expression: gary-s-brown
+        spdx_license_expression: LicenseRef-scancode-gary-s-brown
+        from_file:
         start_line: 469
         end_line: 470
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gary-s-brown
-        spdx_license_expression: LicenseRef-scancode-gary-s-brown
-        rule_identifier: gary-s-brown.LICENSE
         rule_relevance: 100
+        rule_identifier: gary-s-brown.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gary-s-brown.LICENSE
         matched_text: |
           You may use this program, or
@@ -559,17 +559,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 514
         end_line: 519
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 74
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_105.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_105.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_105.RULE
         matched_text: |
           I retain copyright in this code but I encourage its free use provided
@@ -582,17 +582,17 @@ license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 531
         end_line: 539
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_70.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_70.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_70.RULE
         matched_text: |
           Please do not copyright this code.  This code is in the public domain.
@@ -608,17 +608,17 @@ license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 549
         end_line: 564
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_67.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_67.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_67.RULE
         matched_text: |
           NO COPYRIGHT - THIS IS 100% IN THE PUBLIC DOMAIN
@@ -641,17 +641,17 @@ license_detections:
   - license_expression: gpl-2.0 OR bsd-new
     license_expression_spdx: GPL-2.0-only OR BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 OR bsd-new
+        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
+        from_file:
         start_line: 580
         end_line: 587
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 50
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0 OR bsd-new
-        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
-        rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -666,17 +666,17 @@ license_detections:
   - license_expression: gpl-2.0 OR bsd-new
     license_expression_spdx: GPL-2.0-only OR BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 OR bsd-new
+        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
+        from_file:
         start_line: 594
         end_line: 601
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 50
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0 OR bsd-new
-        spdx_license_expression: GPL-2.0-only OR BSD-3-Clause
-        rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_or_bsd-new_aes_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -691,17 +691,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 613
         end_line: 635
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1040.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1040.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1040.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -731,17 +731,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 646
         end_line: 668
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1209.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1209.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1209.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -771,17 +771,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 677
         end_line: 697
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_76.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -809,17 +809,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 705
         end_line: 715
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
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 22649f92dd2..ece97531fb5 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
@@ -15,17 +15,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 9
         end_line: 28
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '199'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1070.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1070.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1070.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted provided
@@ -52,17 +52,17 @@ license_detections:
   - license_expression: linux-openib
     license_expression_spdx: Linux-OpenIB
     matches:
-      - score: '100.0'
+      - license_expression: linux-openib
+        spdx_license_expression: Linux-OpenIB
+        from_file:
         start_line: 35
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: linux-openib
-        spdx_license_expression: Linux-OpenIB
-        rule_identifier: linux-openib.LICENSE
         rule_relevance: 100
+        rule_identifier: linux-openib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-openib.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or
@@ -90,17 +90,17 @@ license_detections:
   - license_expression: qlogic-microcode
     license_expression_spdx: LicenseRef-scancode-qlogic-microcode
     matches:
-      - score: '100.0'
+      - license_expression: qlogic-microcode
+        spdx_license_expression: LicenseRef-scancode-qlogic-microcode
+        from_file:
         start_line: 61
         end_line: 96
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 260
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: qlogic-microcode
-        spdx_license_expression: LicenseRef-scancode-qlogic-microcode
-        rule_identifier: qlogic-microcode.LICENSE
         rule_relevance: 100
+        rule_identifier: qlogic-microcode.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/qlogic-microcode.LICENSE
         matched_text: |
           You may redistribute the hardware specific firmware binary file
@@ -143,33 +143,33 @@ license_detections:
   - license_expression: other-permissive AND proprietary-license
     license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 102
         end_line: 104
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware data
           in hexadecimal or equivalent format, provided this copyright notice is
           accompanying it.
-      - score: '97.33'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 106
         end_line: 112
-        from_file:
+        matcher: 3-seq
+        score: '97.33'
         matched_length: 73
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_310.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_310.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_310.RULE
         matched_text: |
           grants permission to use and redistribute these firmware files
@@ -183,17 +183,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 117
         end_line: 119
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware data
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 e5f6ee2cf63..daaded87d27 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 20
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 114
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_68.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_68.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_68.RULE
         matched_text: |
           License:
@@ -35,17 +35,17 @@ license_detections:
               You should have received a copy of the GNU General Public License
               along with this package; if not, write to the Free Software
               Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General
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 882ec3ab355..05bf4eb59ae 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 9
         end_line: 11
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_66.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_66.RULE
         matched_text: |
           Permission is hereby granted for the distribution of this firmware
@@ -29,17 +29,17 @@ license_detections:
   - license_expression: intel
     license_expression_spdx: LicenseRef-scancode-intel
     matches:
-      - score: '93.72'
+      - license_expression: intel
+        spdx_license_expression: LicenseRef-scancode-intel
+        from_file:
         start_line: 18
         end_line: 53
-        from_file:
+        matcher: 3-seq
+        score: '93.72'
         matched_length: 293
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: intel
-        spdx_license_expression: LicenseRef-scancode-intel
-        rule_identifier: intel_1.RULE
         rule_relevance: 95
+        rule_identifier: intel_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/intel_1.RULE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
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 5f2860e66e9..2e559cc954f 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 6
         end_line: 13
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 77
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_307.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_307.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_307.RULE
         matched_text: |
           Samsung grants permission to use and redistribute aforementioned firmware
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 7313b89469f..21eb5eec93a 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '97.98'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 9
         end_line: 34
-        from_file:
+        matcher: 3-seq
+        score: '97.98'
         matched_length: '194'
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1006.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1006.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1006.RULE
         matched_text: |
           Redistribution. Redistribution and use in binary form, without
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 92309d7d377..8312e832035 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 9
         end_line: 65
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 436
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_556.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_556.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_556.RULE
         matched_text: "All rights reserved not granted herein.\n\nLimited License.\n\nTexas\
           \ Instruments Incorporated grants a world-wide, royalty-free, non-exclusive\nlicense\
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 9043db0c033..33037532109 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mongodb-sspl-1.0
     license_expression_spdx: SSPL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
+        from_file:
         start_line: 18
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mongodb-sspl-1.0
-        spdx_license_expression: SSPL-1.0
-        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
         matched_text: |
           License:
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 9043db0c033..33037532109 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mongodb-sspl-1.0
     license_expression_spdx: SSPL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
+        from_file:
         start_line: 18
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mongodb-sspl-1.0
-        spdx_license_expression: SSPL-1.0
-        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
         matched_text: |
           License:
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 9043db0c033..33037532109 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mongodb-sspl-1.0
     license_expression_spdx: SSPL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
+        from_file:
         start_line: 18
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mongodb-sspl-1.0
-        spdx_license_expression: SSPL-1.0
-        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
         matched_text: |
           License:
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 9043db0c033..33037532109 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mongodb-sspl-1.0
     license_expression_spdx: SSPL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
+        from_file:
         start_line: 18
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mongodb-sspl-1.0
-        spdx_license_expression: SSPL-1.0
-        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
         matched_text: |
           License:
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 9043db0c033..33037532109 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mongodb-sspl-1.0
     license_expression_spdx: SSPL-1.0
     matches:
-      - score: '100.0'
+      - license_expression: mongodb-sspl-1.0
+        spdx_license_expression: SSPL-1.0
+        from_file:
         start_line: 18
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mongodb-sspl-1.0
-        spdx_license_expression: SSPL-1.0
-        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_relevance: 100
+        rule_identifier: mongodb-sspl-1.0_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mongodb-sspl-1.0_9.RULE
         matched_text: |
           License:
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 419f003a203..fd724b31be6 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
@@ -12,17 +12,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 21
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_600.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_600.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_600.RULE
         matched_text: |
           Redistribution.  Redistribution and use in binary form, without
@@ -54,17 +54,17 @@ license_detections:
   - license_expression: broadcom-proprietary
     license_expression_spdx: LicenseRef-scancode-broadcom-proprietary
     matches:
-      - score: '100.0'
+      - license_expression: broadcom-proprietary
+        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
+        from_file:
         start_line: 51
         end_line: 254
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1770
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: broadcom-proprietary
-        spdx_license_expression: LicenseRef-scancode-broadcom-proprietary
-        rule_identifier: broadcom-proprietary_1.RULE
         rule_relevance: 100
+        rule_identifier: broadcom-proprietary_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/broadcom-proprietary_1.RULE
         matched_text: "SOFTWARE LICENSE AGREEMENT\n\nUnless you and Broadcom Corporation (“Broadcom”)\
           \ execute a separate written\nsoftware license agreement governing use of the accompanying\
@@ -210,30 +210,30 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 260
         end_line: 260
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 261
         end_line: 275
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_846.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_846.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_846.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
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 a93688768e4..b1ff22e7298 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 42
         end_line: 59
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_17.RULE
         rule_relevance: 100
+        rule_identifier: zlib_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
         matched_text: |
           This software is provided 'as-is', without any express or implied
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 55e90686ce3..b24722e7257 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 28
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_811.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_811.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_811.RULE
         matched_text: |
           and is
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 064f65324a7..79284662593 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
@@ -7,30 +7,30 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 4
         end_line: 4
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_374.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_374.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE
         matched_text: 'License: GPLv2+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 22
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_736.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_736.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_736.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 e29ed30d5dc..f9e07ad0b02 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 17
         end_line: 28
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_862.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_862.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_862.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 922a574fddd..13798ea9244 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
@@ -13,30 +13,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 23
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 24
         end_line: 25
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1188.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1188.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1188.RULE
         matched_text: |
           On Debian and Debian-based systems, a copy of the GNU General Public
@@ -45,17 +45,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '99.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 13
         end_line: 13
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
+        rule_identifier: pypi_public_domain.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
         matched_text: 'License: public-domain'
     identifier: public_domain-1a6a4f2c-bd92-9942-920f-be3d0c2bbda6
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 f398d885884..47b2c1bfba2 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
@@ -13,17 +13,17 @@ license_detections:
     license_expression_spdx: GPL-3.0-or-later AND LicenseRef-scancode-bash-exception-gpl-2.0
       AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 13
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 118
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_289.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_289.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_289.RULE
         matched_text: |
           Bash is free software; you can redistribute it and/or modify it under
@@ -40,17 +40,17 @@ license_detections:
           along with Bash.  If not, see .
           On Debian systems, the complete text of the GNU General Public License
           can be found in `/usr/share/common-licenses/GPL-3'.
-      - score: '100.0'
+      - license_expression: bash-exception-gpl
+        spdx_license_expression: LicenseRef-scancode-bash-exception-gpl-2.0
+        from_file:
         start_line: 28
         end_line: 34
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bash-exception-gpl
-        spdx_license_expression: LicenseRef-scancode-bash-exception-gpl-2.0
-        rule_identifier: bash-exception-gpl.LICENSE
         rule_relevance: 100
+        rule_identifier: bash-exception-gpl.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bash-exception-gpl.LICENSE
         matched_text: |
           The Free Software Foundation has exempted Bash from the requirement of
@@ -60,34 +60,34 @@ license_detections:
           and standards expect shells not to print such messages.  This
           exception applies to any program that serves as a shell and that is
           based primarily on Bash as opposed to other GNU software.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 37
         end_line: 37
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl_72.RULE
         rule_relevance: 100
+        rule_identifier: gpl_72.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE
         matched_text: License GPL
     identifier: gpl_3_0_plus_and_bash_exception_gpl_and_gpl_1_0_plus-97ecff07-b029-2b9f-7d04-2b0e02ccce04
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 44
         end_line: 48
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 45
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_207.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_207.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_207.RULE
         matched_text: |
           Permission is hereby granted, without written agreement and
@@ -99,17 +99,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 55
         end_line: 64
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_22.RULE
         matched_text: |
           Permission is granted to make and distribute verbatim copies of
@@ -126,17 +126,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 71
         end_line: 76
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -149,33 +149,33 @@ license_detections:
   - license_expression: other-permissive AND latex2e
     license_expression_spdx: LicenseRef-scancode-other-permissive AND Latex2e
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 82
         end_line: 84
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_206.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_206.RULE
         matched_text: |
           Permission is granted to make and distribute verbatim copies of
            this manual provided the copyright notice and this permission notice
            pare preserved on all copies.
-      - score: '99.0'
+      - license_expression: latex2e
+        spdx_license_expression: Latex2e
+        from_file:
         start_line: 86
         end_line: 99
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: latex2e
-        spdx_license_expression: Latex2e
-        rule_identifier: latex2e_7.RULE
         rule_relevance: 99
+        rule_identifier: latex2e_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_7.RULE
         matched_text: |
           Permission is granted to process this file through TeX and print the
@@ -196,17 +196,17 @@ license_detections:
   - license_expression: latex2e
     license_expression_spdx: Latex2e
     matches:
-      - score: '99.0'
+      - license_expression: latex2e
+        spdx_license_expression: Latex2e
+        from_file:
         start_line: 108
         end_line: 124
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: latex2e
-        spdx_license_expression: Latex2e
-        rule_identifier: latex2e_3.RULE
         rule_relevance: 99
+        rule_identifier: latex2e_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_3.RULE
         matched_text: |
           Permission is granted to process this file through Tex and print the
@@ -230,17 +230,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 132
         end_line: 137
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -253,17 +253,17 @@ license_detections:
   - license_expression: latex2e
     license_expression_spdx: Latex2e
     matches:
-      - score: '99.0'
+      - license_expression: latex2e
+        spdx_license_expression: Latex2e
+        from_file:
         start_line: 144
         end_line: 160
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: latex2e
-        spdx_license_expression: Latex2e
-        rule_identifier: latex2e_2.RULE
         rule_relevance: 99
+        rule_identifier: latex2e_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_2.RULE
         matched_text: |
           Permission is granted to make and distribute verbatim copies of this manual
@@ -287,17 +287,17 @@ license_detections:
   - license_expression: bsd-original-uc AND historical
     license_expression_spdx: BSD-4-Clause-UC AND HPND
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 168
         end_line: '194'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -327,17 +327,17 @@ license_detections:
            * LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: historical
+        spdx_license_expression: HPND
+        from_file:
         start_line: '198'
         end_line: 212
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: historical
-        spdx_license_expression: HPND
-        rule_identifier: historical_10.RULE
         rule_relevance: 100
+        rule_identifier: historical_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -359,17 +359,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 220
         end_line: 223
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 28
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_291.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_291.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_291.RULE
         matched_text: |
           Permission is granted to distribute, modify and use this program as long
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 444c48f119f..fe9ea8e9852 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
@@ -11,17 +11,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '81.1'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 22
         end_line: 41
-        from_file:
+        matcher: 3-seq
+        score: '81.1'
         matched_length: 103
         match_coverage: '81.1'
-        matcher: 3-seq
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_487.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_487.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_487.RULE
         matched_text: |
           License
@@ -48,17 +48,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 47
         end_line: 69
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -88,17 +88,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 78
         end_line: 89
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -117,17 +117,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 95
         end_line: 117
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -157,17 +157,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 126
         end_line: 137
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -186,17 +186,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 145
         end_line: 157
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 110
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_4.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -216,17 +216,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 162
         end_line: 173
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -245,17 +245,17 @@ license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 180
         end_line: 182
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -265,17 +265,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '75.18'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: '193'
         end_line: 214
-        from_file:
+        matcher: 3-seq
+        score: '75.18'
         matched_length: 106
         match_coverage: '75.18'
-        matcher: 3-seq
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_286.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_286.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_286.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -300,17 +300,17 @@ license_detections:
 
              This program is free software: you can redistribute it and/or modify
              it under the terms of the GNU General Public License
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 213
         end_line: 224
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -329,17 +329,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 233
         end_line: 244
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -358,17 +358,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 253
         end_line: 264
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_290.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_290.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -387,17 +387,17 @@ license_detections:
   - license_expression: gfdl-1.2-plus
     license_expression_spdx: GFDL-1.2-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
+        from_file:
         start_line: 272
         end_line: 277
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 62
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.2-plus
-        spdx_license_expression: GFDL-1.2-or-later
-        rule_identifier: gfdl-1.2-plus.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.2-plus.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2-plus.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -410,17 +410,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 285
         end_line: 299
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_2.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
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 991541b5da5..29a4d0baf96 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
@@ -49,17 +49,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 155
         end_line: 177
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -89,17 +89,17 @@ other_license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 180
         end_line: 181
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-free.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
         matched_text: |
           This configure script is free software; the Free Software Foundation
@@ -108,17 +108,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 184
         end_line: '191'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 63
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -133,17 +133,17 @@ other_license_detections:
   - license_expression: x11-xconsortium AND public-domain
     license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: '194'
         end_line: 214
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -167,47 +167,47 @@ other_license_detections:
           be used in advertising or otherwise to promote the sale, use or other deal-
           ings in this Software without prior written authorization from the X Consor-
           tium.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 216
         end_line: 216
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_58.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_58.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-85b6bf80-9de9-fe71-fa83-14be44f52a4b
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 218
         end_line: 218
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 219
         end_line: 234
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -230,17 +230,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '99.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 138
         end_line: 138
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
+        rule_identifier: pypi_public_domain.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
         matched_text: 'License: public-domain'
     identifier: public_domain-1a6a4f2c-bd92-9942-920f-be3d0c2bbda6
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 7e4f2320dbe..23db0ea39c0 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
@@ -24,17 +24,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '99.45'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 59
         end_line: 78
-        from_file:
+        matcher: 3-seq
+        score: '99.45'
         matched_length: 182
         match_coverage: '99.45'
-        matcher: 3-seq
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_52.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_52.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_52.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 f966eba882d..a9f0a968bec 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '90.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 26
-        from_file:
+        matcher: 3-seq
+        score: '90.0'
         matched_length: 162
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_306.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_306.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_306.RULE
         matched_text: "The keys in the keyrings don't fall under any copyright.  Everything\n\
           else in the package is covered by the GNU GPL.\n\nDebian support files Copyright (C)\
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 287b73fa1cc..891b6dd93e4 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND public-domain
     license_expression_spdx: GPL-2.0-or-later AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus AND public-domain
+        spdx_license_expression: GPL-2.0-or-later AND LicenseRef-scancode-public-domain
+        from_file:
         start_line: 8
         end_line: 11
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 31
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus AND public-domain
-        spdx_license_expression: GPL-2.0-or-later AND LicenseRef-scancode-public-domain
-        rule_identifier: gpl-2.0-plus_and_public-domain_810.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_and_public-domain_810.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_public-domain_810.RULE
         matched_text: |
           redistributed under the terms of the GNU GPL, Version 2 or later,
@@ -29,17 +29,17 @@ license_detections:
   - license_expression: smail-gpl
     license_expression_spdx: LicenseRef-scancode-smail-gpl
     matches:
-      - score: '100.0'
+      - license_expression: smail-gpl
+        spdx_license_expression: LicenseRef-scancode-smail-gpl
+        from_file:
         start_line: 18
         end_line: 161
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 1227
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: smail-gpl
-        spdx_license_expression: LicenseRef-scancode-smail-gpl
-        rule_identifier: smail-gpl.LICENSE
         rule_relevance: 100
+        rule_identifier: smail-gpl.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/smail-gpl.LICENSE
         matched_text: "SMAIL GENERAL PUBLIC LICENSE\n\t\t       (Clarified 11 Feb 1988)\n\n\
           \ Copyright (C)  1988 Landon Curt Noll & Ronald S. Karr\n Copyright (C)  1992 Ronald\
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 fd2adf18f1b..738e2206daf 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 18
         end_line: 29
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 100
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_234.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_234.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_234.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -36,17 +36,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 38
         end_line: 44
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 67
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_3.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
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 e939ffdee53..337678c6350 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
@@ -23,90 +23,90 @@ other_license_detections:
   - license_expression: public-domain AND other-permissive
     license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive
     matches:
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 102
         end_line: 102
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain.
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 103
         end_line: 104
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_277.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_277.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_277.RULE
         matched_text: |
           May be used and distributed
           freely for any purpose.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 106
         end_line: 106
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_346.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_346.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 107
         end_line: 108
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_348.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_348.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_348.RULE
         matched_text: |
           also placed in the Public
           Domain.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 111
         end_line: 111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_347.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_347.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_347.RULE
         matched_text: placed in public domain as well.
     identifier: public_domain_and_other_permissive-6d37fe29-1db1-5e5f-a49b-c1130b99e1cd
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 118
         end_line: 120
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_303.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_303.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_303.RULE
         matched_text: |
           This code was
@@ -116,30 +116,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 127
         end_line: 127
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 128
         end_line: 139
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_860.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -154,17 +154,17 @@ other_license_detections:
 
           You should have received a copy of the GNU General Public License
           along with this program.  If not, see .
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 141
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 31
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1299.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1299.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1299.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General Public License
@@ -174,30 +174,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 145
         end_line: 145
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 146
         end_line: 156
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1119.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1119.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1119.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify
@@ -215,17 +215,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '99.45'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 159
         end_line: 178
-        from_file:
+        matcher: 3-seq
+        score: '99.45'
         matched_length: 182
         match_coverage: '99.45'
-        matcher: 3-seq
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_52.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_52.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_52.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 dd8da3c19f6..6517e12a768 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
     license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
-      - score: '99.02'
+      - 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
+        from_file:
         start_line: 17
         end_line: 30
-        from_file:
+        matcher: 3-seq
+        score: '99.02'
         matched_length: 101
         match_coverage: '99.02'
-        matcher: 3-seq
-        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
-        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         matched_text: "This package, the EXT2 filesystem utilities, are made available under\n\
           the GNU General Public License version 2, with the exception of the\nlib/ext2fs and\
@@ -34,17 +34,17 @@ license_detections:
   - license_expression: ntp-0 AND bsd-new
     license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: ntp-0
+        spdx_license_expression: NTP-0
+        from_file:
         start_line: 38
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ntp-0
-        spdx_license_expression: NTP-0
-        rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
+        rule_identifier: ntp-0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -55,17 +55,17 @@ license_detections:
              M.I.T. S.I.P.B. make no representations about the suitability of
              this software for any purpose.  It is provided "as is" without
              express or implied warranty.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 49
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 aaadd2a4e1f..16b10701555 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.3-plus
     license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later
     matches:
-      - score: '87.25'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 49
         end_line: 73
-        from_file:
+        matcher: 3-seq
+        score: '87.25'
         matched_length: 130
         match_coverage: '87.25'
-        matcher: 3-seq
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_410.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_410.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_410.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -45,17 +45,17 @@ license_detections:
           Permission is granted to copy, distribute and/or modify this
           document under the terms of the GNU Free Documentation License,
           Version
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 71
         end_line: 81
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_6.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_6.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this
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 532a82e57a7..8fab71d48fb 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,17 +42,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
     license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 83
         end_line: 99
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 133
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         matched_text: |
           GCC is free software; you can redistribute it and/or modify it under
@@ -72,17 +72,17 @@ license_detections:
           On Debian GNU/Linux systems, the complete text of the GNU General
           Public License is in `/usr/share/common-licenses/GPL', version 3 of this
           license in `/usr/share/common-licenses/GPL-3'.
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 101
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         matched_text: |
           The following runtime libraries are licensed under the terms of the
@@ -92,17 +92,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 123
         end_line: 149
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: "Redistribution and use in source and binary forms, with or without\n\
           modification, are permitted provided that the following conditions are\nmet:\n\n \
@@ -125,17 +125,17 @@ license_detections:
   - license_expression: uoi-ncsa AND mit
     license_expression_spdx: NCSA AND MIT
     matches:
-      - score: '100.0'
+      - license_expression: uoi-ncsa
+        spdx_license_expression: NCSA
+        from_file:
         start_line: 167
         end_line: '192'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 224
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: uoi-ncsa
-        spdx_license_expression: NCSA
-        rule_identifier: uoi-ncsa_9.RULE
         rule_relevance: 100
+        rule_identifier: uoi-ncsa_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/uoi-ncsa_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -164,17 +164,17 @@ license_detections:
           LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
           OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
           SOFTWARE.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: '194'
         end_line: 210
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -198,17 +198,17 @@ license_detections:
   - license_expression: mit AND gfdl-1.2 AND gcc-exception-3.1
     license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 217
         end_line: 234
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 158
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1083.RULE
         rule_relevance: 100
+        rule_identifier: mit_1083.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1083.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -229,33 +229,33 @@ license_detections:
               OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
               ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
               OTHER DEALINGS IN THE SOFTWARE.
-      - score: '100.0'
+      - license_expression: gfdl-1.2
+        spdx_license_expression: GFDL-1.2-only
+        from_file:
         start_line: 237
         end_line: 239
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.2
-        spdx_license_expression: GFDL-1.2-only
-        rule_identifier: gfdl-1.2_7.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.2_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2_7.RULE
         matched_text: |
           The documentation is licensed under the GNU Free Documentation License (v1.2).
           On Debian GNU/Linux systems, the complete text of this license is in
           `/usr/share/common-licenses/GFDL-1.2'.
-      - score: '100.0'
+      - license_expression: gcc-exception-3.1
+        spdx_license_expression: GCC-exception-3.1
+        from_file:
         start_line: 242
         end_line: 313
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 512
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gcc-exception-3.1
-        spdx_license_expression: GCC-exception-3.1
-        rule_identifier: gcc-exception-3.1.LICENSE
         rule_relevance: 100
+        rule_identifier: gcc-exception-3.1.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gcc-exception-3.1.LICENSE
         matched_text: |
           GCC RUNTIME LIBRARY EXCEPTION
@@ -334,17 +334,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 322
         end_line: 331
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_469.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_469.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_469.RULE
         matched_text: |
           This file is part of the libiberty library.
@@ -361,17 +361,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 338
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -387,17 +387,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 356
         end_line: 364
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -413,17 +413,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 374
         end_line: 382
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -439,34 +439,34 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 387
         end_line: 387
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain.
     identifier: public_domain-3dd945ae-65df-7d90-6467-60f8ecf2eb77
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 395
         end_line: 403
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -482,17 +482,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 410
         end_line: 418
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -508,17 +508,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 424
         end_line: 427
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
@@ -529,17 +529,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 434
         end_line: 458
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_166.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -571,17 +571,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 473
         end_line: 480
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_812.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_812.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_812.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -596,17 +596,17 @@ license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
+        from_file:
         start_line: 490
         end_line: 495
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 46
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0_2.RULE
         matched_text: |
           License for redistribution is by either the Artistic License or
@@ -619,17 +619,17 @@ license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 503
         end_line: 517
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -651,17 +651,17 @@ license_detections:
   - license_expression: d-zlib
     license_expression_spdx: LicenseRef-scancode-d-zlib
     matches:
-      - score: '100.0'
+      - license_expression: d-zlib
+        spdx_license_expression: LicenseRef-scancode-d-zlib
+        from_file:
         start_line: 529
         end_line: 545
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: d-zlib
-        spdx_license_expression: LicenseRef-scancode-d-zlib
-        rule_identifier: d-zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: d-zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/d-zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -685,17 +685,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 557
         end_line: 574
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -720,17 +720,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
     license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 581
         end_line: 598
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         matched_text: |
           This file is free software; you can redistribute it and/or modify it
@@ -755,17 +755,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 609
         end_line: 617
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify
@@ -781,17 +781,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 623
         end_line: 626
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 46
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_4.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_4.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -803,17 +803,17 @@ license_detections:
     license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1 AND GPL-3.0-or-later WITH
       GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
+        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 635
         end_line: 647
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
-        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
-        rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -829,17 +829,17 @@ license_detections:
           Under Section 7 of GPL version 3, you are granted additional
           permissions described in the GCC Runtime Library Exception, version
           3.1, as published by the Free Software Foundation.
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 650
         end_line: 651
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_41.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_41.RULE
         matched_text: |
           This has a mix of licenses, most as GPL-3+ plus GCC Runtime Library
@@ -851,69 +851,69 @@ license_detections:
       AND GPL-3.0-only) AND GPL-3.0-or-later AND LicenseRef-scancode-gnu-emacs-gpl-1988 AND
       (GPL-3.0-only AND LGPL-2.1-only) AND (GPL-2.0-or-later AND GPL-3.0-or-later)
     matches:
-      - score: '100.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
+        from_file:
         start_line: 663
         end_line: 663
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         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
-      - score: '100.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
+        from_file:
         start_line: 666
         end_line: 666
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         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
-      - score: '100.0'
+      - license_expression: lgpl-2.0 AND gpl-3.0
+        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
+        from_file:
         start_line: 670
         end_line: 670
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0 AND gpl-3.0
-        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
-        rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         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.
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 673
         end_line: 673
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_89.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_89.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE
         matched_text: GPL-3+
-      - score: '100.0'
+      - license_expression: gnu-emacs-gpl-1988
+        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
+        from_file:
         start_line: 676
         end_line: 682
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gnu-emacs-gpl-1988
-        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
-        rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_relevance: 100
+        rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gnu-emacs-gpl-1988_1.RULE
         matched_text: |
           Everyone is granted permission to copy, modify and redistribute
@@ -923,47 +923,47 @@ license_detections:
           ;; can know your rights and responsibilities.  It should be in a
           ;; file named COPYING.  Among other things, the copyright notice
           ;; and this notice must be preserved on all copies.
-      - score: '100.0'
+      - license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
+        from_file:
         start_line: 686
         end_line: 686
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0 AND lgpl-2.1
-        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
-        rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         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.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 690
         end_line: 690
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         matched_text: Mix of GPL-2+ and GPL-3+
     identifier: gpl_3_0_and_lgpl_2_1_and_lgpl_3_0__and__lgpl_2_0_and_gpl_3_0__and_gpl_3_0_plus_and_gnu_emacs_gpl_1988_and__gpl_3_0_and_lgpl_2_1__and__gpl_2_0_plus_and_gpl_3_0_plus-d1c41ede-85ab-f71e-acff-90e3585e0615
   - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
     license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
+        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 701
         end_line: 713
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus WITH gcc-exception-3.1
-        spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1
-        rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_with_gcc-exception-3.1_1.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -983,17 +983,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus AND gpl-1.0-plus
     license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 739
         end_line: 745
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         matched_text: |
           Parts of this work are licensed under the terms of the GNU General
@@ -1007,17 +1007,17 @@ license_detections:
   - license_expression: bsla-no-advert
     license_expression_spdx: LicenseRef-scancode-bsla-no-advert
     matches:
-      - score: '100.0'
+      - license_expression: bsla-no-advert
+        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
+        from_file:
         start_line: 754
         end_line: 764
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsla-no-advert
-        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
-        rule_identifier: bsla-no-advert.LICENSE
         rule_relevance: 100
+        rule_identifier: bsla-no-advert.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla-no-advert.LICENSE
         matched_text: "Redistribution and use in source and binary forms are permitted\nprovided\
           \ that the above copyright notice and this paragraph are\nduplicated in all such forms\
@@ -1032,17 +1032,17 @@ license_detections:
   - license_expression: bsla
     license_expression_spdx: BSD-4.3TAHOE
     matches:
-      - score: '100.0'
+      - license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
+        from_file:
         start_line: 771
         end_line: 781
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 101
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsla
-        spdx_license_expression: BSD-4.3TAHOE
-        rule_identifier: bsla.LICENSE
         rule_relevance: 100
+        rule_identifier: bsla.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -1060,17 +1060,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 789
         end_line: 815
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1104,17 +1104,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 822
         end_line: 844
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1144,17 +1144,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 856
         end_line: 882
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1188,17 +1188,17 @@ license_detections:
   - license_expression: flex-2.5
     license_expression_spdx: BSD-3-Clause-flex
     matches:
-      - score: '100.0'
+      - license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
+        from_file:
         start_line: 889
         end_line: 901
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 122
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: flex-2.5
-        spdx_license_expression: BSD-3-Clause-flex
-        rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
+        rule_identifier: flex-2.5_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -1218,17 +1218,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 909
         end_line: 909
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc.RULE
         matched_text: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     identifier: bsd_original_uc-3028f908-0199-4878-9644-da1c6c536067
@@ -1237,19 +1237,19 @@ license_detections:
     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
     matches:
-      - score: '100.0'
+      - 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
+          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 919
         end_line: 921
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
-        rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         matched_text: |
           This software is a copyrighted work licensed under the terms of the
@@ -1259,17 +1259,17 @@ license_detections:
   - license_expression: x11-lucent
     license_expression_spdx: dtoa
     matches:
-      - score: '100.0'
+      - license_expression: x11-lucent
+        spdx_license_expression: dtoa
+        from_file:
         start_line: 929
         end_line: 938
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 93
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-lucent
-        spdx_license_expression: dtoa
-        rule_identifier: x11-lucent.RULE
         rule_relevance: 100
+        rule_identifier: x11-lucent.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -1286,17 +1286,17 @@ license_detections:
   - license_expression: amd-historical
     license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
-      - score: '100.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 944
         end_line: 955
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 98
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
         matched_text: |
           This software is the property of Advanced Micro Devices, Inc  (AMD)  which
@@ -1315,17 +1315,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 983
         end_line: 986
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: "Developed at SunPro, a Sun Microsystems, Inc. business.\nPermission to\
           \ use, copy, modify, and distribute this\nsoftware is freely granted, provided that\
@@ -1334,17 +1334,17 @@ license_detections:
   - license_expression: hp-1986
     license_expression_spdx: HP-1986
     matches:
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 992
         end_line: 1001
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -1361,17 +1361,17 @@ license_detections:
   - license_expression: nilsson-historical
     license_expression_spdx: LicenseRef-scancode-nilsson-historical
     matches:
-      - score: '100.0'
+      - license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
+        from_file:
         start_line: 1007
         end_line: 1014
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 55
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nilsson-historical
-        spdx_license_expression: LicenseRef-scancode-nilsson-historical
-        rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: nilsson-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software is
@@ -1386,17 +1386,17 @@ license_detections:
   - license_expression: newlib-historical
     license_expression_spdx: LicenseRef-scancode-newlib-historical
     matches:
-      - score: '100.0'
+      - license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
+        from_file:
         start_line: 1020
         end_line: 1028
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: newlib-historical
-        spdx_license_expression: LicenseRef-scancode-newlib-historical
-        rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: newlib-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
         matched_text: |
           The authors hereby grant permission to use, copy, modify, distribute,
@@ -1412,17 +1412,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1035
         end_line: 1055
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1450,17 +1450,17 @@ license_detections:
   - license_expression: amd-historical
     license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
-      - score: '95.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 1061
         end_line: 1072
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 95
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical4.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
         matched_text: "This software is the property of SuperH, Inc (SuperH) which specifically\n\
           grants the user the right to modify, use and distribute this software\nprovided this\
@@ -1474,17 +1474,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1087
         end_line: 1112
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1517,17 +1517,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1119
         end_line: 1138
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1554,17 +1554,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1145
         end_line: 1164
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 181
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_newlib3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1591,17 +1591,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1171
         end_line: 1190
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1628,17 +1628,17 @@ license_detections:
   - license_expression: x11-hanson
     license_expression_spdx: LicenseRef-scancode-x11-hanson
     matches:
-      - score: '99.0'
+      - license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
+        from_file:
         start_line: 1198
         end_line: 1207
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 89
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-hanson
-        spdx_license_expression: LicenseRef-scancode-x11-hanson
-        rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
+        rule_identifier: x11-hanson2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -1655,17 +1655,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1214
         end_line: 1233
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1692,17 +1692,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1240
         end_line: 1260
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_76.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1730,34 +1730,34 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1274
         end_line: 1274
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl_39.RULE
         rule_relevance: 100
+        rule_identifier: lgpl_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_39.RULE
         matched_text: Free Software Foundation LGPL License (*-
     identifier: lgpl_2_0_plus-3510e639-5cec-653e-6f61-1a4daf9a674b
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1281
         end_line: 1294
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 123
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_12.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -1774,30 +1774,30 @@ license_detections:
              License along with the GNU C Library; if not, write to the Free
              Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
              02110-1301 USA
-      - score: '99.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1296
         end_line: 1296
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl_33.RULE
         rule_relevance: 99
+        rule_identifier: lgpl_33.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE
         matched_text: LGPL License (
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1300
         end_line: 1308
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 81
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_339.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_339.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_339.RULE
         matched_text: "This program is free software; you can redistribute it and/or\nmodify\
           \ it under the terms of the GNU Library General Public License\nas published by the\
@@ -1810,17 +1810,17 @@ license_detections:
   - license_expression: intel-osl-1993
     license_expression_spdx: LicenseRef-scancode-intel-osl-1993
     matches:
-      - score: '100.0'
+      - license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
+        from_file:
         start_line: 1314
         end_line: 1336
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel-osl-1993
-        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
-        rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
+        rule_identifier: intel-osl-1993.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
         matched_text: |
           Intel hereby grants you permission to copy, modify, and distribute this
@@ -1850,17 +1850,17 @@ license_detections:
   - license_expression: hp-1986
     license_expression_spdx: HP-1986
     matches:
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 1342
         end_line: 1351
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -1877,17 +1877,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 1356
         end_line: 1374
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: hs-regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
         matched_text: |
           This software is not subject to any license of the American Telephone
@@ -1913,17 +1913,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1381
         end_line: 1400
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1950,17 +1950,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1407
         end_line: 1426
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1987,17 +1987,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1435
         end_line: 1454
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2024,17 +2024,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1466
         end_line: 1489
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_983.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_983.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_983.RULE
         matched_text: "Redistribution and use in source and binary forms, with or without \n\
           modification, are permitted provided that the following conditions are met: \n\n \
@@ -2058,17 +2058,17 @@ license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 1494
         end_line: 1511
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 151
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_6.RULE
         rule_relevance: 100
+        rule_identifier: unicode_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_6.RULE
         matched_text: |
           UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
@@ -2089,17 +2089,17 @@ license_detections:
           FILES OR SOFTWARE.
 
               COPYRIGHT AND PERMISSION NOTICE
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 1513
         end_line: 1543
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed under
@@ -2137,17 +2137,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1550
         end_line: 1562
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_284.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_284.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_284.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
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 00edce009c2..b20efc4be46 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,17 +48,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
     license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 83
         end_line: 99
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 133
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_21.RULE
         matched_text: |
           GCC is free software; you can redistribute it and/or modify it under
@@ -78,17 +78,17 @@ license_detections:
           On Debian GNU/Linux systems, the complete text of the GNU General
           Public License is in `/usr/share/common-licenses/GPL', version 3 of this
           license in `/usr/share/common-licenses/GPL-3'.
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 101
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_18.RULE
         matched_text: |
           The following runtime libraries are licensed under the terms of the
@@ -98,17 +98,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 123
         end_line: 149
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: "Redistribution and use in source and binary forms, with or without\n\
           modification, are permitted provided that the following conditions are\nmet:\n\n \
@@ -131,17 +131,17 @@ license_detections:
   - license_expression: uoi-ncsa AND mit
     license_expression_spdx: NCSA AND MIT
     matches:
-      - score: '100.0'
+      - license_expression: uoi-ncsa
+        spdx_license_expression: NCSA
+        from_file:
         start_line: 167
         end_line: '192'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 224
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: uoi-ncsa
-        spdx_license_expression: NCSA
-        rule_identifier: uoi-ncsa_9.RULE
         rule_relevance: 100
+        rule_identifier: uoi-ncsa_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/uoi-ncsa_9.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -170,17 +170,17 @@ license_detections:
           LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
           OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
           SOFTWARE.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: '194'
         end_line: 210
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -204,17 +204,17 @@ license_detections:
   - license_expression: mit AND gfdl-1.2 AND gcc-exception-3.1
     license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 217
         end_line: 234
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 158
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1083.RULE
         rule_relevance: 100
+        rule_identifier: mit_1083.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1083.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -235,33 +235,33 @@ license_detections:
               OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
               ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
               OTHER DEALINGS IN THE SOFTWARE.
-      - score: '100.0'
+      - license_expression: gfdl-1.2
+        spdx_license_expression: GFDL-1.2-only
+        from_file:
         start_line: 237
         end_line: 239
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.2
-        spdx_license_expression: GFDL-1.2-only
-        rule_identifier: gfdl-1.2_7.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.2_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2_7.RULE
         matched_text: |
           The documentation is licensed under the GNU Free Documentation License (v1.2).
           On Debian GNU/Linux systems, the complete text of this license is in
           `/usr/share/common-licenses/GFDL-1.2'.
-      - score: '100.0'
+      - license_expression: gcc-exception-3.1
+        spdx_license_expression: GCC-exception-3.1
+        from_file:
         start_line: 242
         end_line: 313
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 512
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gcc-exception-3.1
-        spdx_license_expression: GCC-exception-3.1
-        rule_identifier: gcc-exception-3.1.LICENSE
         rule_relevance: 100
+        rule_identifier: gcc-exception-3.1.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gcc-exception-3.1.LICENSE
         matched_text: |
           GCC RUNTIME LIBRARY EXCEPTION
@@ -340,17 +340,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 322
         end_line: 331
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_469.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_469.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_469.RULE
         matched_text: |
           This file is part of the libiberty library.
@@ -367,17 +367,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 338
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -393,17 +393,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 356
         end_line: 364
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -419,17 +419,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 374
         end_line: 382
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -445,34 +445,34 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 387
         end_line: 387
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain.
     identifier: public_domain-3dd945ae-65df-7d90-6467-60f8ecf2eb77
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 395
         end_line: 403
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_327.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_327.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -488,17 +488,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 410
         end_line: 418
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -514,17 +514,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 424
         end_line: 427
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
@@ -535,17 +535,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 434
         end_line: 458
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_166.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_166.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -577,17 +577,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 473
         end_line: 480
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_812.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_812.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_812.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -602,17 +602,17 @@ license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
+        from_file:
         start_line: 490
         end_line: 495
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 46
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0_2.RULE
         matched_text: |
           License for redistribution is by either the Artistic License or
@@ -625,17 +625,17 @@ license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 503
         end_line: 517
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -657,17 +657,17 @@ license_detections:
   - license_expression: d-zlib
     license_expression_spdx: LicenseRef-scancode-d-zlib
     matches:
-      - score: '100.0'
+      - license_expression: d-zlib
+        spdx_license_expression: LicenseRef-scancode-d-zlib
+        from_file:
         start_line: 529
         end_line: 545
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: d-zlib
-        spdx_license_expression: LicenseRef-scancode-d-zlib
-        rule_identifier: d-zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: d-zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/d-zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -691,17 +691,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 557
         end_line: 574
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -726,17 +726,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
     license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 581
         end_line: 598
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_10.RULE
         matched_text: |
           This file is free software; you can redistribute it and/or modify it
@@ -761,17 +761,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 606
         end_line: 614
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify
@@ -787,17 +787,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 620
         end_line: 623
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 46
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_4.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_4.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -808,17 +808,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 629
         end_line: 637
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -834,17 +834,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
     license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH gcc-exception-3.1
+        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
+        from_file:
         start_line: 643
         end_line: 646
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH gcc-exception-3.1
-        spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1
-        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify it under
@@ -855,17 +855,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 661
         end_line: 669
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -881,17 +881,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 675
         end_line: 683
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -907,17 +907,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 705
         end_line: 713
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify
@@ -933,17 +933,17 @@ license_detections:
   - license_expression: gpl-3.0-plus AND (gpl-3.0 AND lgpl-2.1)
     license_expression_spdx: GPL-3.0-or-later AND (GPL-3.0-only AND LGPL-2.1-only)
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 728
         end_line: 736
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify it under
@@ -955,34 +955,34 @@ license_detections:
           WARRANTY; without even the implied warranty of MERCHANTABILITY or
           FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
           for more details.
-      - score: '95.0'
+      - license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
+        from_file:
         start_line: 739
         end_line: 739
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0 AND lgpl-2.1
-        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
-        rule_identifier: gpl-3.0_and_lgpl-2.1_1.RULE
         rule_relevance: 95
+        rule_identifier: gpl-3.0_and_lgpl-2.1_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_1.RULE
         matched_text: This has a mix of licenses, both LGPL-2.1 and GPL-3.0, plus the apparently
     identifier: gpl_3_0_plus_and__gpl_3_0_and_lgpl_2_1-c16ec1a5-26e8-5560-9e27-e9ca7ec4a7d2
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 757
         end_line: 765
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -998,17 +998,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 771
         end_line: 779
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify it under
@@ -1027,17 +1027,17 @@ license_detections:
       AND LGPL-2.1-only AND LGPL-3.0-only) AND (LGPL-2.0-only AND GPL-3.0-only) AND GPL-3.0-or-later
       AND LicenseRef-scancode-gnu-emacs-gpl-1988
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 785
         end_line: 793
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -1049,82 +1049,82 @@ license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           Lesser General Public License for more details.
-      - score: '100.0'
+      - license_expression: lgpl-3.0 AND gpl-3.0
+        spdx_license_expression: LGPL-3.0-only AND GPL-3.0-only
+        from_file:
         start_line: 797
         end_line: 797
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-3.0 AND gpl-3.0
-        spdx_license_expression: LGPL-3.0-only AND GPL-3.0-only
-        rule_identifier: lgpl-3.0_and_gpl-3.0_3.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0_and_gpl-3.0_3.RULE
         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
-      - score: '100.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
+        from_file:
         start_line: 801
         end_line: 801
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         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
-      - score: '100.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
+        from_file:
         start_line: 805
         end_line: 805
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE
         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
-      - score: '100.0'
+      - license_expression: lgpl-2.0 AND gpl-3.0
+        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
+        from_file:
         start_line: 809
         end_line: 809
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0 AND gpl-3.0
-        spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only
-        rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_and_gpl-3.0_1.RULE
         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.
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 812
         end_line: 812
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_89.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_89.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE
         matched_text: GPL-3+
-      - score: '100.0'
+      - license_expression: gnu-emacs-gpl-1988
+        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
+        from_file:
         start_line: 815
         end_line: 821
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gnu-emacs-gpl-1988
-        spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988
-        rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_relevance: 100
+        rule_identifier: gnu-emacs-gpl-1988_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gnu-emacs-gpl-1988_1.RULE
         matched_text: |
           Everyone is granted permission to copy, modify and redistribute
@@ -1138,30 +1138,30 @@ license_detections:
   - license_expression: (gpl-3.0 AND lgpl-2.1) AND (gpl-2.0-plus AND gpl-3.0-plus)
     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:
-      - score: '100.0'
+      - license_expression: gpl-3.0 AND lgpl-2.1
+        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
+        from_file:
         start_line: 826
         end_line: 826
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0 AND lgpl-2.1
-        spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only
-        rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_lgpl-2.1_2.RULE
         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.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 830
         end_line: 830
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_and_gpl-3.0-plus_3.RULE
         matched_text: Mix of GPL-2+ and GPL-3+
     identifier: gpl_3_0_and_lgpl_2_1__and__gpl_2_0_plus_and_gpl_3_0_plus-41b20618-fcb3-c4b1-b693-d0562b1c05e4
@@ -1170,17 +1170,17 @@ license_detections:
     license_expression_spdx: LGPL-2.1-or-later AND (LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only)
       AND (LGPL-2.1-only AND LGPL-3.0-only)
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 837
         end_line: 845
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_34.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -1192,43 +1192,43 @@ license_detections:
           but WITHOUT ANY WARRANTY; without even the implied warranty of
           MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
           Lesser General Public License for more details.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 849
         end_line: 849
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.1_and_lgpl-3.0_and_gpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_and_lgpl-3.0_and_gpl-3.0_1.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.1 AND lgpl-3.0
+        spdx_license_expression: LGPL-2.1-only AND LGPL-3.0-only
+        from_file:
         start_line: 853
         end_line: 853
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1 AND lgpl-3.0
-        spdx_license_expression: LGPL-2.1-only AND LGPL-3.0-only
-        rule_identifier: lgpl-2.1_and_lgpl-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_and_lgpl-3.0_1.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 857
         end_line: 866
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_396.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_396.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_396.RULE
         matched_text: |
           License: LGPL-2.1+
@@ -1245,17 +1245,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 872
         end_line: 880
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify it under
@@ -1271,17 +1271,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 886
         end_line: 894
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify
@@ -1297,17 +1297,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 899
         end_line: 907
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify it under
@@ -1323,17 +1323,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 913
         end_line: 921
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_397.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_397.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_397.RULE
         matched_text: |
           GNU Modula-2 is free software; you can redistribute it and/or modify
@@ -1349,17 +1349,17 @@ license_detections:
   - license_expression: lgpl-2.0-plus AND gpl-1.0-plus
     license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 947
         end_line: 953
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-1.0-plus_2.RULE
         matched_text: |
           Parts of this work are licensed under the terms of the GNU General
@@ -1373,17 +1373,17 @@ license_detections:
   - license_expression: bsla-no-advert
     license_expression_spdx: LicenseRef-scancode-bsla-no-advert
     matches:
-      - score: '100.0'
+      - license_expression: bsla-no-advert
+        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
+        from_file:
         start_line: 962
         end_line: 972
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsla-no-advert
-        spdx_license_expression: LicenseRef-scancode-bsla-no-advert
-        rule_identifier: bsla-no-advert.LICENSE
         rule_relevance: 100
+        rule_identifier: bsla-no-advert.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla-no-advert.LICENSE
         matched_text: "Redistribution and use in source and binary forms are permitted\nprovided\
           \ that the above copyright notice and this paragraph are\nduplicated in all such forms\
@@ -1398,17 +1398,17 @@ license_detections:
   - license_expression: bsla
     license_expression_spdx: BSD-4.3TAHOE
     matches:
-      - score: '100.0'
+      - license_expression: bsla
+        spdx_license_expression: BSD-4.3TAHOE
+        from_file:
         start_line: 979
         end_line: 989
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 101
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsla
-        spdx_license_expression: BSD-4.3TAHOE
-        rule_identifier: bsla.LICENSE
         rule_relevance: 100
+        rule_identifier: bsla.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsla.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -1426,17 +1426,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 997
         end_line: 1023
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1470,17 +1470,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1030
         end_line: 1052
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1510,17 +1510,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 1064
         end_line: 1090
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1554,17 +1554,17 @@ license_detections:
   - license_expression: flex-2.5
     license_expression_spdx: BSD-3-Clause-flex
     matches:
-      - score: '100.0'
+      - license_expression: flex-2.5
+        spdx_license_expression: BSD-3-Clause-flex
+        from_file:
         start_line: 1097
         end_line: 1109
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 122
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: flex-2.5
-        spdx_license_expression: BSD-3-Clause-flex
-        rule_identifier: flex-2.5_6.RULE
         rule_relevance: 100
+        rule_identifier: flex-2.5_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/flex-2.5_6.RULE
         matched_text: |
           Redistribution and use in source and binary forms are permitted
@@ -1584,17 +1584,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 1117
         end_line: 1117
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc.RULE
         matched_text: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     identifier: bsd_original_uc-3028f908-0199-4878-9644-da1c6c536067
@@ -1603,19 +1603,19 @@ license_detections:
     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
     matches:
-      - score: '100.0'
+      - 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
+          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1127
         end_line: 1129
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive
-        rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_gpl-2.0_and_lgpl-3.0-plus_and_other-copyleft_and_other-permissive_1.RULE
         matched_text: |
           This software is a copyrighted work licensed under the terms of the
@@ -1625,17 +1625,17 @@ license_detections:
   - license_expression: x11-lucent
     license_expression_spdx: dtoa
     matches:
-      - score: '100.0'
+      - license_expression: x11-lucent
+        spdx_license_expression: dtoa
+        from_file:
         start_line: 1137
         end_line: 1146
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 93
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-lucent
-        spdx_license_expression: dtoa
-        rule_identifier: x11-lucent.RULE
         rule_relevance: 100
+        rule_identifier: x11-lucent.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-lucent.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -1652,17 +1652,17 @@ license_detections:
   - license_expression: amd-historical
     license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
-      - score: '100.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 1152
         end_line: 1163
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 98
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical_1.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical_1.RULE
         matched_text: |
           This software is the property of Advanced Micro Devices, Inc  (AMD)  which
@@ -1681,17 +1681,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 1191
         end_line: 1194
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: "Developed at SunPro, a Sun Microsystems, Inc. business.\nPermission to\
           \ use, copy, modify, and distribute this\nsoftware is freely granted, provided that\
@@ -1700,17 +1700,17 @@ license_detections:
   - license_expression: hp-1986
     license_expression_spdx: HP-1986
     matches:
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 1200
         end_line: 1209
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -1727,17 +1727,17 @@ license_detections:
   - license_expression: nilsson-historical
     license_expression_spdx: LicenseRef-scancode-nilsson-historical
     matches:
-      - score: '100.0'
+      - license_expression: nilsson-historical
+        spdx_license_expression: LicenseRef-scancode-nilsson-historical
+        from_file:
         start_line: 1215
         end_line: 1222
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 55
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nilsson-historical
-        spdx_license_expression: LicenseRef-scancode-nilsson-historical
-        rule_identifier: nilsson-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: nilsson-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/nilsson-historical.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software is
@@ -1752,17 +1752,17 @@ license_detections:
   - license_expression: newlib-historical
     license_expression_spdx: LicenseRef-scancode-newlib-historical
     matches:
-      - score: '100.0'
+      - license_expression: newlib-historical
+        spdx_license_expression: LicenseRef-scancode-newlib-historical
+        from_file:
         start_line: 1228
         end_line: 1236
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 92
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: newlib-historical
-        spdx_license_expression: LicenseRef-scancode-newlib-historical
-        rule_identifier: newlib-historical.LICENSE
         rule_relevance: 100
+        rule_identifier: newlib-historical.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/newlib-historical.LICENSE
         matched_text: |
           The authors hereby grant permission to use, copy, modify, distribute,
@@ -1778,17 +1778,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1243
         end_line: 1263
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_98.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_98.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_98.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1816,17 +1816,17 @@ license_detections:
   - license_expression: amd-historical
     license_expression_spdx: LicenseRef-scancode-amd-historical
     matches:
-      - score: '95.0'
+      - license_expression: amd-historical
+        spdx_license_expression: LicenseRef-scancode-amd-historical
+        from_file:
         start_line: 1269
         end_line: 1280
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 95
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: amd-historical
-        spdx_license_expression: LicenseRef-scancode-amd-historical
-        rule_identifier: amd-historical4.RULE
         rule_relevance: 100
+        rule_identifier: amd-historical4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/amd-historical4.RULE
         matched_text: "This software is the property of SuperH, Inc (SuperH) which specifically\n\
           grants the user the right to modify, use and distribute this software\nprovided this\
@@ -1840,17 +1840,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1295
         end_line: 1320
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1883,17 +1883,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1327
         end_line: 1346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1920,17 +1920,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1353
         end_line: 1372
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 181
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_newlib3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_newlib3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_newlib3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1957,17 +1957,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1379
         end_line: 1398
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1994,17 +1994,17 @@ license_detections:
   - license_expression: x11-hanson
     license_expression_spdx: LicenseRef-scancode-x11-hanson
     matches:
-      - score: '99.0'
+      - license_expression: x11-hanson
+        spdx_license_expression: LicenseRef-scancode-x11-hanson
+        from_file:
         start_line: 1406
         end_line: 1415
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 89
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-hanson
-        spdx_license_expression: LicenseRef-scancode-x11-hanson
-        rule_identifier: x11-hanson2.RULE
         rule_relevance: 99
+        rule_identifier: x11-hanson2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-hanson2.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -2021,17 +2021,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1422
         end_line: 1441
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2058,17 +2058,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1448
         end_line: 1468
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_76.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_76.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_76.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2096,34 +2096,34 @@ license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1482
         end_line: 1482
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl_39.RULE
         rule_relevance: 100
+        rule_identifier: lgpl_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_39.RULE
         matched_text: Free Software Foundation LGPL License (*-
     identifier: lgpl_2_0_plus-3510e639-5cec-653e-6f61-1a4daf9a674b
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1489
         end_line: 1502
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 123
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_12.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -2140,30 +2140,30 @@ license_detections:
              License along with the GNU C Library; if not, write to the Free
              Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
              02110-1301 USA
-      - score: '99.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1504
         end_line: 1504
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl_33.RULE
         rule_relevance: 99
+        rule_identifier: lgpl_33.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE
         matched_text: LGPL License (
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 1508
         end_line: 1516
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 81
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_339.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_339.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_339.RULE
         matched_text: "This program is free software; you can redistribute it and/or\nmodify\
           \ it under the terms of the GNU Library General Public License\nas published by the\
@@ -2176,17 +2176,17 @@ license_detections:
   - license_expression: intel-osl-1993
     license_expression_spdx: LicenseRef-scancode-intel-osl-1993
     matches:
-      - score: '100.0'
+      - license_expression: intel-osl-1993
+        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
+        from_file:
         start_line: 1522
         end_line: 1544
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: intel-osl-1993
-        spdx_license_expression: LicenseRef-scancode-intel-osl-1993
-        rule_identifier: intel-osl-1993.LICENSE
         rule_relevance: 100
+        rule_identifier: intel-osl-1993.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/intel-osl-1993.LICENSE
         matched_text: |
           Intel hereby grants you permission to copy, modify, and distribute this
@@ -2216,17 +2216,17 @@ license_detections:
   - license_expression: hp-1986
     license_expression_spdx: HP-1986
     matches:
-      - score: '100.0'
+      - license_expression: hp-1986
+        spdx_license_expression: HP-1986
+        from_file:
         start_line: 1550
         end_line: 1559
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hp-1986
-        spdx_license_expression: HP-1986
-        rule_identifier: hp-1986.LICENSE
         rule_relevance: 100
+        rule_identifier: hp-1986.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hp-1986.LICENSE
         matched_text: |
           To anyone who acknowledges that this file is provided "AS IS"
@@ -2243,17 +2243,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 1564
         end_line: 1582
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: hs-regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
         matched_text: |
           This software is not subject to any license of the American Telephone
@@ -2279,17 +2279,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1589
         end_line: 1608
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2316,17 +2316,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1615
         end_line: 1634
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2353,17 +2353,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1643
         end_line: 1662
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -2390,17 +2390,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1674
         end_line: 1697
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_983.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_983.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_983.RULE
         matched_text: "Redistribution and use in source and binary forms, with or without \n\
           modification, are permitted provided that the following conditions are met: \n\n \
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 489431c2194..eb23f0a2ff1 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
@@ -40,17 +40,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.05'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 85
         end_line: 110
-        from_file:
+        matcher: 1-hash
+        score: '99.05'
         matched_length: 209
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_594.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_594.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_594.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -83,17 +83,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 114
         end_line: 121
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -108,17 +108,17 @@ other_license_detections:
   - license_expression: ietf
     license_expression_spdx: LicenseRef-scancode-ietf
     matches:
-      - score: '90.0'
+      - license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
+        from_file:
         start_line: 129
         end_line: 144
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 149
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf
-        spdx_license_expression: LicenseRef-scancode-ietf
-        rule_identifier: ietf_7.RULE
         rule_relevance: 90
+        rule_identifier: ietf_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf_7.RULE
         matched_text: |
           This document and translations of it may be copied and furnished to
@@ -141,30 +141,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 147
         end_line: 147
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 148
         end_line: 163
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_480.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_480.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_480.RULE
         matched_text: |
           GnuPG is free software; you can redistribute it and/or modify
@@ -187,30 +187,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 165
         end_line: 165
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 166
         end_line: 181
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_191.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_191.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_191.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -233,30 +233,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 183
         end_line: 183
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 184
         end_line: '199'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 135
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_307.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_307.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_307.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -279,17 +279,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 202
         end_line: 225
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_910.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -320,17 +320,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 228
         end_line: 245
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -355,30 +355,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 247
         end_line: 247
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 248
         end_line: 253
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_131.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_131.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_131.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all
@@ -391,17 +391,17 @@ other_license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 81
         end_line: 81
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_321.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_321.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_321.RULE
         matched_text: This file is licensed permissively
     identifier: other_permissive-9b0e778e-b2cb-3f63-cd43-d76f05797558
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 c6953000e15..b3a299104cd 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
@@ -12,30 +12,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 23
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 27
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_481.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_481.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_481.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 35cde5765f0..47454e79e85 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
@@ -17,30 +17,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 25
         end_line: 25
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 26
         end_line: 40
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 123
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_482.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_482.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_482.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -62,17 +62,17 @@ other_license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 43
         end_line: 50
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 72
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_24.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -87,17 +87,17 @@ other_license_detections:
   - license_expression: latex2e
     license_expression_spdx: Latex2e
     matches:
-      - score: '85.0'
+      - license_expression: latex2e
+        spdx_license_expression: Latex2e
+        from_file:
         start_line: 53
         end_line: 70
-        from_file:
+        matcher: 1-hash
+        score: '85.0'
         matched_length: 138
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: latex2e
-        spdx_license_expression: Latex2e
-        rule_identifier: latex2e_8.RULE
         rule_relevance: 85
+        rule_identifier: latex2e_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/latex2e_8.RULE
         matched_text: |
           Permission is granted to make and distribute verbatim copies of
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 04190626bb0..d59f57e8ac5 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 12
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1033.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1033.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1033.RULE
         matched_text: "This program is free software; you can redistribute it and/or modify\n\
           \tit under the terms of the GNU General Public License as published by\n\tthe Free\
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 6a9c98c23e4..64bc9fcf9fe 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
@@ -17,30 +17,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 25
         end_line: 25
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 26
         end_line: 41
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -63,17 +63,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 47
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1068.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1068.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1068.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 4ccd72c0e83..eb501c707b8 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
@@ -12,30 +12,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 8
         end_line: 8
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 9
         end_line: 20
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_860.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -50,17 +50,17 @@ other_license_detections:
 
           You should have received a copy of the GNU General Public License
           along with this program.  If not, see .
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1160.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
         matched_text: |
           On Debian systems, the full text of the GNU General Public License
@@ -69,30 +69,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 39
         end_line: 39
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 40
         end_line: 51
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_306.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_306.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_306.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -111,17 +111,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1160.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
         matched_text: |
           On Debian systems, the full text of the GNU General Public License
@@ -130,17 +130,17 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 53
         end_line: 54
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_325.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_325.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_325.RULE
         matched_text: |
           On Debian systems, the full text of the GNU Lesser General Public License
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 064f65324a7..79284662593 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
@@ -7,30 +7,30 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 4
         end_line: 4
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_374.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_374.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE
         matched_text: 'License: GPLv2+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 6
         end_line: 22
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_736.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_736.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_736.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 74a6b3f5576..eb0873af9bc 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
@@ -12,30 +12,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 8
         end_line: 8
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 9
         end_line: 20
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_860.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_860.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_860.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -50,17 +50,17 @@ other_license_detections:
 
           You should have received a copy of the GNU General Public License
           along with this program.  If not, see .
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1160.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
         matched_text: |
           On Debian systems, the full text of the GNU General Public License
@@ -69,30 +69,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 32
         end_line: 32
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 33
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_306.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_306.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_306.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -111,17 +111,17 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 22
         end_line: 23
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1160.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1160.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1160.RULE
         matched_text: |
           On Debian systems, the full text of the GNU General Public License
@@ -130,17 +130,17 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 46
         end_line: 47
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_325.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_325.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_325.RULE
         matched_text: |
           On Debian systems, the full text of the GNU Lesser General Public License
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 4721ad5e819..66b9004d6b0 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
@@ -15,30 +15,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 16
         end_line: 16
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '97.44'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 17
         end_line: 21
-        from_file:
+        matcher: 2-aho
+        score: '97.44'
         matched_length: 38
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_372.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_372.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_372.RULE
         matched_text: |
           library libaudit.* is released under LGPL
@@ -50,30 +50,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 28
         end_line: 28
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '99.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 29
         end_line: 43
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1031.RULE
         rule_relevance: 99
+        rule_identifier: gpl-2.0_1031.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1031.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or modify
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 7dd301ffe5d..6afd69f2aa7 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
@@ -10,17 +10,17 @@ other_license_detections:
   - license_expression: bzip2-libbzip-2010
     license_expression_spdx: bzip2-1.0.6
     matches:
-      - score: '100.0'
+      - license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
+        from_file:
         start_line: 8
         end_line: 37
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 233
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bzip2-libbzip-2010
-        spdx_license_expression: bzip2-1.0.6
-        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
+        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -57,30 +57,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 46
         end_line: 46
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 47
         end_line: 48
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1294.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1294.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1294.RULE
         matched_text: |
           The full text of the GNU General Public License version 2
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 bb967e597aa..b39c7b918d0 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
@@ -16,17 +16,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 10
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_1.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -50,17 +50,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND bsd-new
     license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause
     matches:
-      - score: '95.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 33
         end_line: 48
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 135
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_15.RULE
         rule_relevance: 95
+        rule_identifier: gpl-2.0-plus_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_15.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -79,17 +79,17 @@ 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'.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 50
         end_line: 51
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_24.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_24.RULE
         matched_text: |
           All code incorporated from 4.4 BSD is distributed under the following
@@ -98,17 +98,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 56
         end_line: 80
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 218
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_57.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_57.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_57.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -140,17 +140,17 @@ license_detections:
   - license_expression: historical
     license_expression_spdx: HPND
     matches:
-      - score: '100.0'
+      - license_expression: historical
+        spdx_license_expression: HPND
+        from_file:
         start_line: 88
         end_line: 102
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: historical
-        spdx_license_expression: HPND
-        rule_identifier: historical_10.RULE
         rule_relevance: 100
+        rule_identifier: historical_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -172,17 +172,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 108
         end_line: 119
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -201,17 +201,17 @@ license_detections:
   - license_expression: bsd-new AND carnegie-mellon-contributors
     license_expression_spdx: BSD-3-Clause AND CMU-Mach
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 126
         end_line: 151
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_591.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -240,17 +240,17 @@ license_detections:
                 WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: carnegie-mellon-contributors
+        spdx_license_expression: CMU-Mach
+        from_file:
         start_line: 153
         end_line: 179
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: carnegie-mellon-contributors
-        spdx_license_expression: CMU-Mach
-        rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_relevance: 100
+        rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/carnegie-mellon-contributors_3.RULE
         matched_text: |
           The following CMU license covers some of the support code for Mach,
@@ -280,17 +280,17 @@ license_detections:
               or Software.Distribution@CS.CMU.EDU any improvements or
               extensions that they make and grant Carnegie Mellon the rights to
               redistribute these changes.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 181
         end_line: 206
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 219
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_592.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_592.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_592.RULE
         matched_text: |
           under the following CMU license:
@@ -319,17 +319,17 @@ license_detections:
                IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 208
         end_line: 211
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_593.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_593.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_593.RULE
         matched_text: |
           The following license covers the files from Intel's "Highly Optimized
@@ -340,17 +340,17 @@ license_detections:
   - license_expression: bsd-new AND inner-net-2.0
     license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 217
         end_line: 242
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 204
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_2.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_2.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -379,17 +379,17 @@ license_detections:
               LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: inner-net-2.0
+        spdx_license_expression: Inner-Net-2.0
+        from_file:
         start_line: 245
         end_line: 280
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 314
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: inner-net-2.0
-        spdx_license_expression: Inner-Net-2.0
-        rule_identifier: inner-net-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: inner-net-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/inner-net-2.0_2.RULE
         matched_text: |
           distributed under the following license:
@@ -432,17 +432,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 286
         end_line: 289
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 48
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_177.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_177.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_177.RULE
         matched_text: |
           This file is distributed under the terms of the GNU Lesser General
@@ -453,17 +453,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 298
         end_line: 309
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_491.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_491.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_491.RULE
         matched_text: |
           GNU Libidn is free software; you can redistribute it and/or
@@ -478,17 +478,17 @@ license_detections:
 
               You should have received a copy of the GNU Lesser General Public
               License along with GNU Libidn; if not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 313
         end_line: 314
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_573.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_573.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_573.RULE
         matched_text: |
           This file contains functions from GLIB, including gutf8.c and
@@ -497,17 +497,17 @@ license_detections:
   - license_expression: punycode AND ietf
     license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf
     matches:
-      - score: '100.0'
+      - license_expression: punycode
+        spdx_license_expression: LicenseRef-scancode-punycode
+        from_file:
         start_line: 324
         end_line: 332
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: punycode
-        spdx_license_expression: LicenseRef-scancode-punycode
-        rule_identifier: punycode.LICENSE
         rule_relevance: 100
+        rule_identifier: punycode.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/punycode.LICENSE
         matched_text: |
           Disclaimer and license: Regarding this entire document or any
@@ -519,17 +519,17 @@ license_detections:
               provided that redistributed derivative works do not contain
               misleading author or version information.  Derivative works need
               not be licensed under similar terms.
-      - score: '100.0'
+      - license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
+        from_file:
         start_line: 336
         end_line: 358
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 209
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf
-        spdx_license_expression: LicenseRef-scancode-ietf
-        rule_identifier: ietf.LICENSE
         rule_relevance: 100
+        rule_identifier: ietf.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ietf.LICENSE
         matched_text: |
           This document and translations of it may be copied and furnished to
@@ -559,17 +559,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 365
         end_line: 387
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -599,17 +599,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 395
         end_line: 409
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_144.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_144.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_144.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and its
@@ -631,17 +631,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 414
         end_line: 432
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: hs-regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
         matched_text: |
           This software is not subject to any license of the American Telephone
@@ -667,17 +667,17 @@ license_detections:
   - license_expression: pcre
     license_expression_spdx: LicenseRef-scancode-pcre
     matches:
-      - score: '95.0'
+      - license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
+        from_file:
         start_line: 438
         end_line: 473
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 271
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pcre
-        spdx_license_expression: LicenseRef-scancode-pcre
-        rule_identifier: pcre_2.RULE
         rule_relevance: 95
+        rule_identifier: pcre_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_2.RULE
         matched_text: |
           Permission is granted to anyone to use this software for any purpose on any
@@ -720,17 +720,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 479
         end_line: 482
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
@@ -741,17 +741,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 488
         end_line: 491
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_145.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_145.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_145.RULE
         matched_text: |
           Feel free to copy, use and distribute this software provided:
@@ -762,17 +762,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 497
         end_line: 509
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
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 bb967e597aa..b39c7b918d0 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
@@ -16,17 +16,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 10
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_1.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -50,17 +50,17 @@ license_detections:
   - license_expression: gpl-2.0-plus AND bsd-new
     license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause
     matches:
-      - score: '95.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 33
         end_line: 48
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 135
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_15.RULE
         rule_relevance: 95
+        rule_identifier: gpl-2.0-plus_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_15.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -79,17 +79,17 @@ 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'.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 50
         end_line: 51
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_24.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_24.RULE
         matched_text: |
           All code incorporated from 4.4 BSD is distributed under the following
@@ -98,17 +98,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 56
         end_line: 80
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 218
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_57.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_57.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_57.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -140,17 +140,17 @@ license_detections:
   - license_expression: historical
     license_expression_spdx: HPND
     matches:
-      - score: '100.0'
+      - license_expression: historical
+        spdx_license_expression: HPND
+        from_file:
         start_line: 88
         end_line: 102
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: historical
-        spdx_license_expression: HPND
-        rule_identifier: historical_10.RULE
         rule_relevance: 100
+        rule_identifier: historical_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/historical_10.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -172,17 +172,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 108
         end_line: 119
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -201,17 +201,17 @@ license_detections:
   - license_expression: bsd-new AND carnegie-mellon-contributors
     license_expression_spdx: BSD-3-Clause AND CMU-Mach
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 126
         end_line: 151
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_591.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -240,17 +240,17 @@ license_detections:
                 WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: carnegie-mellon-contributors
+        spdx_license_expression: CMU-Mach
+        from_file:
         start_line: 153
         end_line: 179
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: carnegie-mellon-contributors
-        spdx_license_expression: CMU-Mach
-        rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_relevance: 100
+        rule_identifier: carnegie-mellon-contributors_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/carnegie-mellon-contributors_3.RULE
         matched_text: |
           The following CMU license covers some of the support code for Mach,
@@ -280,17 +280,17 @@ license_detections:
               or Software.Distribution@CS.CMU.EDU any improvements or
               extensions that they make and grant Carnegie Mellon the rights to
               redistribute these changes.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 181
         end_line: 206
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 219
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_592.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_592.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_592.RULE
         matched_text: |
           under the following CMU license:
@@ -319,17 +319,17 @@ license_detections:
                IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 208
         end_line: 211
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_593.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_593.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_593.RULE
         matched_text: |
           The following license covers the files from Intel's "Highly Optimized
@@ -340,17 +340,17 @@ license_detections:
   - license_expression: bsd-new AND inner-net-2.0
     license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 217
         end_line: 242
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 204
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_2.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_2.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -379,17 +379,17 @@ license_detections:
               LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: inner-net-2.0
+        spdx_license_expression: Inner-Net-2.0
+        from_file:
         start_line: 245
         end_line: 280
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 314
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: inner-net-2.0
-        spdx_license_expression: Inner-Net-2.0
-        rule_identifier: inner-net-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: inner-net-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/inner-net-2.0_2.RULE
         matched_text: |
           distributed under the following license:
@@ -432,17 +432,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 286
         end_line: 289
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 48
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_177.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_177.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_177.RULE
         matched_text: |
           This file is distributed under the terms of the GNU Lesser General
@@ -453,17 +453,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND lgpl-2.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 298
         end_line: 309
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_491.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_491.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_491.RULE
         matched_text: |
           GNU Libidn is free software; you can redistribute it and/or
@@ -478,17 +478,17 @@ license_detections:
 
               You should have received a copy of the GNU Lesser General Public
               License along with GNU Libidn; if not, see .
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 313
         end_line: 314
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_573.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_573.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_573.RULE
         matched_text: |
           This file contains functions from GLIB, including gutf8.c and
@@ -497,17 +497,17 @@ license_detections:
   - license_expression: punycode AND ietf
     license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf
     matches:
-      - score: '100.0'
+      - license_expression: punycode
+        spdx_license_expression: LicenseRef-scancode-punycode
+        from_file:
         start_line: 324
         end_line: 332
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: punycode
-        spdx_license_expression: LicenseRef-scancode-punycode
-        rule_identifier: punycode.LICENSE
         rule_relevance: 100
+        rule_identifier: punycode.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/punycode.LICENSE
         matched_text: |
           Disclaimer and license: Regarding this entire document or any
@@ -519,17 +519,17 @@ license_detections:
               provided that redistributed derivative works do not contain
               misleading author or version information.  Derivative works need
               not be licensed under similar terms.
-      - score: '100.0'
+      - license_expression: ietf
+        spdx_license_expression: LicenseRef-scancode-ietf
+        from_file:
         start_line: 336
         end_line: 358
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 209
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf
-        spdx_license_expression: LicenseRef-scancode-ietf
-        rule_identifier: ietf.LICENSE
         rule_relevance: 100
+        rule_identifier: ietf.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ietf.LICENSE
         matched_text: |
           This document and translations of it may be copied and furnished to
@@ -559,17 +559,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 365
         end_line: 387
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_66.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_66.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -599,17 +599,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 395
         end_line: 409
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_144.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_144.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_144.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and its
@@ -631,17 +631,17 @@ license_detections:
   - license_expression: hs-regexp
     license_expression_spdx: Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 414
         end_line: 432
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 147
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: hs-regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/hs-regexp.LICENSE
         matched_text: |
           This software is not subject to any license of the American Telephone
@@ -667,17 +667,17 @@ license_detections:
   - license_expression: pcre
     license_expression_spdx: LicenseRef-scancode-pcre
     matches:
-      - score: '95.0'
+      - license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
+        from_file:
         start_line: 438
         end_line: 473
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 271
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pcre
-        spdx_license_expression: LicenseRef-scancode-pcre
-        rule_identifier: pcre_2.RULE
         rule_relevance: 95
+        rule_identifier: pcre_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_2.RULE
         matched_text: |
           Permission is granted to anyone to use this software for any purpose on any
@@ -720,17 +720,17 @@ license_detections:
   - license_expression: sunpro
     license_expression_spdx: SunPro
     matches:
-      - score: '100.0'
+      - license_expression: sunpro
+        spdx_license_expression: SunPro
+        from_file:
         start_line: 479
         end_line: 482
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sunpro
-        spdx_license_expression: SunPro
-        rule_identifier: sunpro.LICENSE
         rule_relevance: 100
+        rule_identifier: sunpro.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/sunpro.LICENSE
         matched_text: |
           Developed at SunPro, a Sun Microsystems, Inc. business.
@@ -741,17 +741,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 488
         end_line: 491
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_145.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_145.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_145.RULE
         matched_text: |
           Feel free to copy, use and distribute this software provided:
@@ -762,17 +762,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 497
         end_line: 509
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_36.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
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 1b4dbd40b2f..d923a71befd 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 10
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_388.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_388.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_388.RULE
         matched_text: "License:\n\n    This library is free software; you can redistribute it\
           \ and/or\n    modify it under the terms of the GNU Lesser General Public\n    License\
@@ -29,17 +29,17 @@ license_detections:
           \ have received a copy of the GNU Lesser General Public\n    License along with this\
           \ 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'."
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 30
         end_line: 31
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_209.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_209.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_209.RULE
         matched_text: |
           licensed under the GNU General Public License version 2 or above
@@ -48,17 +48,17 @@ license_detections:
   - license_expression: gpl-3.0
     license_expression_spdx: GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 37
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_468.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_468.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_468.RULE
         matched_text: "and is licensed under the GPL version 3, \nsee `/usr/share/common-licenses/GPL-3'."
     identifier: gpl_3_0-3238e4b2-36b1-43fa-44cf-18d881c6b1bf
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 5f68ea38e23..cfba6a19b84 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 14
         end_line: 24
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
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 de8e119980c..a4743ab8350 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
@@ -20,17 +20,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '97.06'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 14
         end_line: 16
-        from_file:
+        matcher: 2-aho
+        score: '97.06'
         matched_length: 33
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_297.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_297.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_297.RULE
         matched_text: |
           The overall license for libxcrypt is the GNU Lesser General Public
@@ -41,138 +41,138 @@ license_detections:
     license_expression_spdx: LGPL-2.1-or-later AND BSD-3-Clause AND LicenseRef-scancode-public-domain
       AND 0BSD AND BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 22
         end_line: 22
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_392.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_392.RULE
         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):'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 25
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_392.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_392.RULE
         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):'
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 29
         end_line: 29
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_308.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_308.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE
         matched_text: '3-clause BSD:'
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 33
         end_line: 33
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_426.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_426.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
         matched_text: Public domain, written by
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 36
         end_line: 36
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_426.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_426.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
         matched_text: Public domain, written by
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 40
         end_line: 40
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 43
         end_line: 43
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 50
         end_line: 50
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
     identifier: lgpl_2_1_plus_and_bsd_new_and_public_domain_and_bsd_zero_and_bsd_simplified-0789af82-1187-8c17-de70-8f158fe859dd
   - license_expression: bsd-zero
     license_expression_spdx: 0BSD
     matches:
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 55
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
     identifier: bsd_zero-79fb5c8c-8a93-cf25-4481-532b6b01d3b7
@@ -180,121 +180,121 @@ license_detections:
     license_expression_spdx: 0BSD AND BSD-2-Clause AND LicenseRef-scancode-public-domain AND
       BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 61
         end_line: 61
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 64
         end_line: 64
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 67
         end_line: 67
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 71
         end_line: 71
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 74
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 77
         end_line: 77
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_426.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_426.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
         matched_text: Public domain, written by
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 80
         end_line: 80
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_308.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_308.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE
         matched_text: '3-clause BSD:'
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 83
         end_line: 83
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_156.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_156.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE
         matched_text: '2-clause BSD:'
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 86
         end_line: 86
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_426.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_426.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE
         matched_text: Public domain, written by
     identifier: bsd_zero_and_bsd_simplified_and_public_domain_and_bsd_new-33742a24-5ed2-ddf4-f29a-58e0cddc9766
@@ -303,173 +303,173 @@ license_detections:
     license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-3.0 AND 0BSD AND FSFAP
       AND GPL-2.0-or-later WITH Autoconf-exception-generic AND LicenseRef-scancode-free-unknown
     matches:
-      - score: '99.0'
+      - license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
+        from_file:
         start_line: 98
         end_line: 98
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
-        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
-        rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         rule_relevance: 99
+        rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         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:'
-      - score: '100.0'
+      - license_expression: bsd-zero
+        spdx_license_expression: 0BSD
+        from_file:
         start_line: 101
         end_line: 101
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-zero
-        spdx_license_expression: 0BSD
-        rule_identifier: bsd-zero_6.RULE
         rule_relevance: 100
+        rule_identifier: bsd-zero_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE
         matched_text: '0-clause BSD:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 104
         end_line: 104
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 107
         end_line: 107
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 111
         end_line: 111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 114
         end_line: 114
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '99.0'
+      - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
+        from_file:
         start_line: 118
         end_line: 118
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
-        rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_17.RULE
         rule_relevance: 99
+        rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_17.RULE
         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:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 121
         end_line: 121
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 124
         end_line: 124
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '99.0'
+      - license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
+        from_file:
         start_line: 128
         end_line: 128
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus WITH autoconf-exception-3.0
-        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0
-        rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         rule_relevance: 99
+        rule_identifier: gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE
         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:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 131
         end_line: 131
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 134
         end_line: 134
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_6.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE
         matched_text: 'FSF All Permissive License:'
-      - score: '100.0'
+      - license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
+        from_file:
         start_line: 137
         end_line: 139
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        rule_identifier: free-unknown_120.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown_120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_120.RULE
         matched_text: |
           Copyright holders unknown, no statement of license (all of these
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 c99d9b063af..febe0535e85 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: sleepycat
     license_expression_spdx: Sleepycat
     matches:
-      - score: '100.0'
+      - license_expression: sleepycat
+        spdx_license_expression: Sleepycat
+        from_file:
         start_line: 5
         end_line: 12
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 61
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sleepycat
-        spdx_license_expression: Sleepycat
-        rule_identifier: sleepycat_17.RULE
         rule_relevance: 100
+        rule_identifier: sleepycat_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_17.RULE
         matched_text: |
           http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
@@ -33,17 +33,17 @@ license_detections:
   - license_expression: sleepycat
     license_expression_spdx: Sleepycat
     matches:
-      - score: '100.0'
+      - license_expression: sleepycat
+        spdx_license_expression: Sleepycat
+        from_file:
         start_line: 18
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 283
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: sleepycat
-        spdx_license_expression: Sleepycat
-        rule_identifier: sleepycat_15.RULE
         rule_relevance: 100
+        rule_identifier: sleepycat_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_15.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -80,17 +80,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 53
         end_line: 75
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -120,17 +120,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 81
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_943.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_943.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -160,17 +160,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 111
         end_line: 133
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 216
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_115.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_115.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_115.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 601165cfd28..97051873a50 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
@@ -7,34 +7,34 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 17
         end_line: 17
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_282.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_282.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_282.RULE
         matched_text: derived portions are public domain)
     identifier: public_domain-8b1c4208-37f4-199b-a316-29e1b9bdceca
   - license_expression: bsd-unmodified
     license_expression_spdx: LicenseRef-scancode-bsd-unmodified
     matches:
-      - score: '100.0'
+      - license_expression: bsd-unmodified
+        spdx_license_expression: LicenseRef-scancode-bsd-unmodified
+        from_file:
         start_line: 22
         end_line: 41
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-unmodified
-        spdx_license_expression: LicenseRef-scancode-bsd-unmodified
-        rule_identifier: bsd-unmodified_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-unmodified_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unmodified_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 dd8da3c19f6..6517e12a768 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
     license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
-      - score: '99.02'
+      - 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
+        from_file:
         start_line: 17
         end_line: 30
-        from_file:
+        matcher: 3-seq
+        score: '99.02'
         matched_length: 101
         match_coverage: '99.02'
-        matcher: 3-seq
-        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
-        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         matched_text: "This package, the EXT2 filesystem utilities, are made available under\n\
           the GNU General Public License version 2, with the exception of the\nlib/ext2fs and\
@@ -34,17 +34,17 @@ license_detections:
   - license_expression: ntp-0 AND bsd-new
     license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: ntp-0
+        spdx_license_expression: NTP-0
+        from_file:
         start_line: 38
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ntp-0
-        spdx_license_expression: NTP-0
-        rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
+        rule_identifier: ntp-0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -55,17 +55,17 @@ license_detections:
              M.I.T. S.I.P.B. make no representations about the suitability of
              this software for any purpose.  It is provided "as is" without
              express or implied warranty.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 49
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 0ac57042bd5..7eb4c39b436 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mit AND gpl-2.0-plus AND gpl-1.0-plus
     license_expression_spdx: MIT AND GPL-2.0-or-later AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 42
         end_line: 59
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -38,17 +38,17 @@ license_detections:
               CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
               TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
               SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-      - score: '79.17'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 62
         end_line: 70
-        from_file:
+        matcher: 3-seq
+        score: '79.17'
         matched_length: 57
         match_coverage: '79.17'
-        matcher: 3-seq
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_858.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_858.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_858.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -60,17 +60,17 @@ license_detections:
           doc/*:
             Permission is granted to copy, distribute and/or modify this document
             under the terms of the GNU General Public License
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 69
         end_line: 76
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 72
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_858.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_858.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_858.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -81,17 +81,17 @@ license_detections:
 
             On Debian GNU/Linux systems, the complete text of the GNU General
             Public License is in `/usr/share/common-licenses/GPL'.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 79
         end_line: 79
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_478.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_478.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_478.RULE
         matched_text: and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
     identifier: mit_and_gpl_2_0_plus_and_gpl_1_0_plus-d975bf27-0617-3629-9279-63c39b163da7
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 0cf176d166d..80a1cf0b1be 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
@@ -22,58 +22,58 @@ license_detections:
       AND FSFULLRWD AND (LGPL-2.1-or-later AND GPL-2.0-or-later) AND (LGPL-2.0-or-later AND
       GPL-2.0-or-later) AND LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 210
         end_line: 211
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_477.RULE
         matched_text: |
           taken from the
           original NTT provided GPL source.
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 215
         end_line: 215
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_319.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_319.RULE
         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
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 218
         end_line: 218
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_311.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_311.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_311.RULE
         matched_text: public domain code
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 222
         end_line: 228
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -83,17 +83,17 @@ license_detections:
            This file is distributed in the hope that it will be useful, but
            WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
            implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 231
         end_line: 236
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 41
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.1-plus_and_gpl-2.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_and_gpl-2.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-2.0-plus_2.RULE
         matched_text: |
           License:
@@ -102,17 +102,17 @@ license_detections:
           License (LGPL) version 2.1 (or later), except for helper and debugging
           binaries. See below for details. The documentation is licensed under
           the GPLv2 (or later), see below.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 240
         end_line: 260
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '194'
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.0-plus_and_gpl-2.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_and_gpl-2.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_gpl-2.0-plus_7.RULE
         matched_text: |
           The library is distributed under the terms of the GNU Lesser
@@ -136,34 +136,34 @@ license_detections:
               less to protect the freedom of the users of the code that it
               covers.  See http://www.gnu.org/philosophy/why-not-lgpl.html for
               more explanation.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 262
         end_line: 262
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_467.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_467.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_467.RULE
         matched_text: the license headers of the LGPL
     identifier: gpl_1_0_plus_and_other_permissive_and_public_domain_and_fsf_unlimited_no_warranty_and__lgpl_2_1_plus_and_gpl_2_0_plus__and__lgpl_2_0_plus_and_gpl_2_0_plus__and_lgpl_2_0_plus-71da280b-c092-be79-7ec6-e3cc205ddfd8
   - license_expression: lgpl-2.1-plus AND gpl-1.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 270
         end_line: 286
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_322.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_322.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_322.RULE
         matched_text: |
           Libgcrypt is free software; you can redistribute it and/or modify
@@ -183,34 +183,34 @@ license_detections:
           On Debian GNU/Linux systems, the complete text of the GNU Lesser
           General Public License can be found in
           `/usr/share/common-licenses/LGPL';
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 288
         end_line: 288
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_476.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_476.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_476.RULE
         matched_text: The documentation licensed under the GPL
     identifier: lgpl_2_1_plus_and_gpl_1_0_plus-1af8506a-97be-93a0-6cba-7d1c0a97c09e
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 294
         end_line: 298
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_767.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_767.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_767.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this document
@@ -222,17 +222,17 @@ license_detections:
   - license_expression: other-permissive AND other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive AND other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 307
         end_line: 308
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive AND other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
-        rule_identifier: other-permissive_and_other-copyleft_3.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_and_other-copyleft_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_other-copyleft_3.RULE
         matched_text: |
           distribution which are not covered by the GNU Lesser
@@ -241,34 +241,34 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 315
         end_line: 315
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_947.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_947.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_947.RULE
         matched_text: BSD_3Clause
     identifier: bsd_new-a83045d9-7f1e-552d-a2b3-29267dd1d408
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 330
         end_line: 357
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 209
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_152.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_152.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_152.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -303,17 +303,17 @@ license_detections:
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 372
         end_line: 402
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 260
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl_2.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl_2.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -351,17 +351,17 @@ license_detections:
   - license_expression: x11-xconsortium AND public-domain
     license_expression_spdx: X11 AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 413
         end_line: 433
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -385,66 +385,66 @@ license_detections:
             be used in advertising or otherwise to promote the sale, use or other deal-
             ings in this Software without prior written authorization from the X Consor-
             tium.
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 436
         end_line: 436
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: Public domain
     identifier: x11_xconsortium_and_public_domain-3a4b5640-3d0e-289d-2ed6-5568ba1f72cd
   - license_expression: public-domain AND ocb-open-source-2013
     license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-ocb-open-source-2013
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 443
         end_line: 444
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_326.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_326.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_326.RULE
         matched_text: |
           Licence: I hereby disclaim the copyright on this code and place it
            in the public domain.
-      - score: '99.0'
+      - license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
+        from_file:
         start_line: 447
         end_line: 447
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ocb-open-source-2013
-        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
-        rule_identifier: ocb-open-source-2013_12.RULE
         rule_relevance: 99
+        rule_identifier: ocb-open-source-2013_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_12.RULE
         matched_text: OCB license 1
     identifier: public_domain_and_ocb_open_source_2013-7ef7f6b1-6db5-43c8-5a10-9e3da7f87fef
   - license_expression: ocb-open-source-2013
     license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013
     matches:
-      - score: '100.0'
+      - license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
+        from_file:
         start_line: 453
         end_line: 457
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 47
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ocb-open-source-2013
-        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
-        rule_identifier: ocb-open-source-2013_11.RULE
         rule_relevance: 100
+        rule_identifier: ocb-open-source-2013_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_11.RULE
         matched_text: |
           OCB is covered by several patents but may be used freely by most
@@ -452,17 +452,17 @@ license_detections:
             In particular license 1 is suitable for Libgcrypt: See
             http://web.cs.ucdavis.edu/~rogaway/ocb/license1.pdf for the full
             license document;
-      - score: '100.0'
+      - license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
+        from_file:
         start_line: 459
         end_line: 466
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 55
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ocb-open-source-2013
-        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
-        rule_identifier: ocb-open-source-2013_8.RULE
         rule_relevance: 100
+        rule_identifier: ocb-open-source-2013_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_8.RULE
         matched_text: |
           License 1 — License for Open-Source Software Implementations of OCB
@@ -473,17 +473,17 @@ license_detections:
               license terminates for you if you sue someone over their
               open-source software implementation of OCB claiming that you have
               a patent covering their implementation.
-      - score: '100.0'
+      - license_expression: ocb-open-source-2013
+        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
+        from_file:
         start_line: 470
         end_line: 540
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 602
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ocb-open-source-2013
-        spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013
-        rule_identifier: ocb-open-source-2013_10.RULE
         rule_relevance: 100
+        rule_identifier: ocb-open-source-2013_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ocb-open-source-2013_10.RULE
         matched_text: |
           License for Open Source Software Implementations of OCB
@@ -561,17 +561,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 545
         end_line: 546
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1159.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1159.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1159.RULE
         matched_text: |
           On Debian GNU/Linux systems, the text of the GNU General Public License,
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 fadaf80a48a..cf3694aac02 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: lgpl-3.0-plus OR gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: '19'
         end_line: 46
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '198'
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_27.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_27.RULE
         matched_text: |
           The GNU MP Library is free software; you can redistribute it and/or modify
@@ -54,34 +54,34 @@ license_detections:
   - license_expression: gfdl-1.1-plus AND (lgpl-2.0-plus OR gpl-1.0-plus)
     license_expression_spdx: GFDL-1.1-or-later AND (LGPL-2.0-or-later OR GPL-1.0-or-later)
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.1-plus
+        spdx_license_expression: GFDL-1.1-or-later
+        from_file:
         start_line: 52
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 38
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.1-plus
-        spdx_license_expression: GFDL-1.1-or-later
-        rule_identifier: gfdl-1.1-plus_32.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.1-plus_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.1-plus_32.RULE
         matched_text: |
           The documentation is released under the GNU Free Documentation License
           (GFDL) and it has cover texts.  As such, it has been determined not to
           meet the Debian Free Software Guidelines, and is not shipped in the
           debian packages.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 57
         end_line: 58
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.0-plus_or_gpl-1.0-plus_300.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_or_gpl-1.0-plus_300.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_or_gpl-1.0-plus_300.RULE
         matched_text: |
           is covered either by the LGPL, or
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 14d5aeb876e..234932b28eb 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
@@ -54,18 +54,18 @@ license_detections:
     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)
     matches:
-      - score: '100.0'
+      - 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
+          AND GPL-2.0-or-later)
+        from_file:
         start_line: 221
         end_line: 233
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          AND GPL-2.0-or-later)
-        rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_and_lgpl-3.0-plus_and_gpl-2.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_and_lgpl-3.0-plus_and_gpl-2.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-3.0-plus_and_lgpl-3.0-plus_and_gpl-2.0-plus_2.RULE
         matched_text: |
           License: The main library is licensed under GNU Lesser
@@ -85,17 +85,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 244
         end_line: 255
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_257.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_257.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_257.RULE
         matched_text: |
           The GnuTLS is free software; you can redistribute it and/or
@@ -114,17 +114,17 @@ license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.1-plus
     license_expression_spdx: GPL-3.0-or-later AND GFDL-1.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 265
         end_line: 276
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 102
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_395.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_395.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_395.RULE
         matched_text: |
           GnuTLS-extra is free software: you can redistribute it and/or modify
@@ -139,17 +139,17 @@ license_detections:
            *
            * You should have received a copy of the GNU General Public License
            * along with this program.  If not, see .
-      - score: '100.0'
+      - license_expression: gfdl-1.1-plus
+        spdx_license_expression: GFDL-1.1-or-later
+        from_file:
         start_line: 280
         end_line: 281
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.1-plus
-        spdx_license_expression: GFDL-1.1-or-later
-        rule_identifier: gfdl-1.1-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.1-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.1-plus_34.RULE
         matched_text: |
           The documentation is distributed under the terms of the GNU Free
@@ -158,17 +158,17 @@ license_detections:
   - license_expression: gfdl-1.3-plus
     license_expression_spdx: GFDL-1.3-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 286
         end_line: 291
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 60
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this
@@ -182,18 +182,18 @@ license_detections:
     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
     matches:
-      - score: '100.0'
+      - 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
+          GPL-3.0-only AND GFDL-1.3-only
+        from_file:
         start_line: 321
         end_line: 327
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 77
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          GPL-3.0-only AND GFDL-1.3-only
-        rule_identifier: lgpl-2.0-plus_and_lgpl-3.0_and_gpl-1.0-plus_and_gpl-3.0_and_gfdl-1.3_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_and_lgpl-3.0_and_gpl-1.0-plus_and_gpl-3.0_and_gfdl-1.3_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_and_lgpl-3.0_and_gpl-1.0-plus_and_gpl-3.0_and_gfdl-1.3_1.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the latest version of
@@ -207,32 +207,32 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND (lgpl-3.0-plus OR gpl-2.0-plus)
     license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 336
         end_line: 337
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_391.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_391.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_391.RULE
         matched_text: |
           released under
           the GNU Lesser General Public License (LGPL) version 2.1 or later.
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 340
         end_line: 342
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_26.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_26.RULE
         matched_text: |
           distributed under a LGPLv3+ or GPLv2+ dual license, and
@@ -242,47 +242,47 @@ license_detections:
   - license_expression: lgpl-2.0-plus AND gpl-3.0
     license_expression_spdx: LGPL-2.0-or-later AND GPL-3.0-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 347
         end_line: 347
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl_48.RULE
         rule_relevance: 100
+        rule_identifier: lgpl_48.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_48.RULE
         matched_text: GNU LGPL
-      - score: '100.0'
+      - license_expression: gpl-3.0
+        spdx_license_expression: GPL-3.0-only
+        from_file:
         start_line: 349
         end_line: 349
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0
-        spdx_license_expression: GPL-3.0-only
-        rule_identifier: gpl-3.0_472.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0_472.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_472.RULE
         matched_text: library are under the GNU GPL version 3.
     identifier: lgpl_2_0_plus_and_gpl_3_0-dcb32f87-5315-099e-bacf-ff21fe9c3759
   - license_expression: bsd-new OR gpl-1.0-plus
     license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new OR gpl-1.0-plus
+        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
+        from_file:
         start_line: 370
         end_line: 402
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 252
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new OR gpl-1.0-plus
-        spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later
-        rule_identifier: bsd-new_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_gpl-1.0-plus_7.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -322,17 +322,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 417
         end_line: 435
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 179
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_8.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_8.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -358,17 +358,17 @@ license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '99.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 446
         end_line: 447
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: pypi_public_domain.RULE
         rule_relevance: 99
+        rule_identifier: pypi_public_domain.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE
         matched_text: |
           License:
@@ -377,17 +377,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 458
         end_line: 469
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -406,17 +406,17 @@ license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 476
         end_line: 504
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 984
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_147.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_147.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_147.RULE
         matched_text: |
           License: CC0 license
@@ -454,30 +454,30 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 511
         end_line: 527
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -501,17 +501,17 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 533
         end_line: 543
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_7.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE
         matched_text: |
           Licensed under the Apache License, Version 2.0 (the "License");
@@ -525,17 +525,17 @@ license_detections:
            *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
            *  See the License for the specific language governing permissions and
            *  limitations under the License.
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 546
         end_line: 548
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_921.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
         matched_text: |
           License: Apache-2.0
@@ -545,34 +545,34 @@ license_detections:
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 556
         end_line: 556
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 564
         end_line: 566
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_921.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
         matched_text: |
           License: Apache-2.0
@@ -582,17 +582,17 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 572
         end_line: 585
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_923.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_923.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_923.RULE
         matched_text: |
           Comment: On Debian systems the complete license text is available in
@@ -613,17 +613,17 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 591
         end_line: 604
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_923.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_923.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_923.RULE
         matched_text: |
           Comment: On Debian systems the complete license text is available in
@@ -644,32 +644,32 @@ license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 610
         end_line: 611
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_919.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_919.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_919.RULE
         matched_text: |
           Comment: On Debian systems the complete license text is available in
            /usr/share/common-licenses/Apache-2.0
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 612
         end_line: 614
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_921.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_921.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_921.RULE
         matched_text: |
           License: Apache-2.0
@@ -679,30 +679,30 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 619
         end_line: 619
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 620
         end_line: 636
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -726,30 +726,30 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 645
         end_line: 645
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 646
         end_line: 662
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -773,30 +773,30 @@ license_detections:
   - license_expression: mit AND lgpl-2.1-plus
     license_expression_spdx: MIT AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 667
         end_line: 667
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 668
         end_line: 684
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -816,77 +816,77 @@ license_detections:
            * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
            * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
            * DEALINGS IN THE SOFTWARE.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 688
         end_line: 688
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_299.RULE
         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+'
     identifier: mit_and_lgpl_2_1_plus-ac329c30-2f5d-a40f-905d-d126eef3c5d1
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 695
         end_line: 695
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 699
         end_line: 699
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 705
         end_line: 705
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_437.RULE
         rule_relevance: 100
+        rule_identifier: mit_437.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE
         matched_text: 'License: Expat'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 706
         end_line: 723
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -911,283 +911,283 @@ license_detections:
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 729
         end_line: 729
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 735
         end_line: 735
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 741
         end_line: 741
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 745
         end_line: 745
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 749
         end_line: 749
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 753
         end_line: 753
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-b4e65bb2-6eb0-e8d4-702f-7d8adaca65f5
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 759
         end_line: 759
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 764
         end_line: 764
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 768
         end_line: 768
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 772
         end_line: 772
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 776
         end_line: 776
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 780
         end_line: 780
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-e47b5aad-c451-e58f-e295-28b4a946f26f
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 785
         end_line: 785
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 789
         end_line: 789
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 794
         end_line: 794
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-a7126328-7d75-71a0-1f22-6dad4c575b97
   - license_expression: lgpl-3.0-plus AND gpl-2.0-plus
     license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 799
         end_line: 799
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 803
         end_line: 803
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
     identifier: lgpl_3_0_plus_and_gpl_2_0_plus-7f23775a-f910-2e50-bb59-826b81ee3ea5
   - license_expression: (lgpl-3.0-plus AND gpl-2.0-plus) AND mit
     license_expression_spdx: (LGPL-3.0-or-later AND GPL-2.0-or-later) AND MIT
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 808
         end_line: 808
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 809
         end_line: 826
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -1212,17 +1212,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 838
         end_line: 855
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -1249,17 +1249,17 @@ license_detections:
     license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-or-later AND GPL-2.0-or-later)
       AND (LGPL-3.0-or-later OR GPL-2.0-or-later)
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 866
         end_line: 877
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_320.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_320.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_320.RULE
         matched_text: |
           Libgcrypt is free software; you can redistribute it and/or modify
@@ -1274,43 +1274,43 @@ license_detections:
            *
            * You should have received a copy of the GNU Lesser General Public
            * License along with this program; if not, see .
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 880
         end_line: 880
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 884
         end_line: 884
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE
         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+'
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 885
         end_line: 907
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_23.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_or_gpl-2.0-plus_23.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_or_gpl-2.0-plus_23.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or
@@ -1340,458 +1340,458 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 927
         end_line: 927
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 940
         end_line: 940
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 945
         end_line: 945
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 949
         end_line: 949
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-6f74e383-639f-5369-8d93-48aa1ec12853
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 954
         end_line: 954
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus AND lgpl-2.1-plus
     license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 964
         end_line: 964
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 968
         end_line: 968
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_299.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 972
         end_line: 972
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus_and_lgpl_2_1_plus-3a037210-69a9-35de-52da-97d13672a103
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 978
         end_line: 978
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 983
         end_line: 983
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 988
         end_line: 988
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 993
         end_line: 993
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 999
         end_line: 999
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1006
         end_line: 1006
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1011
         end_line: 1011
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1015
         end_line: 1015
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1019
         end_line: 1019
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-b9c2bb21-041b-aefb-84f5-ecb3fa0c78f4
   - license_expression: gpl-3.0-plus AND lgpl-2.1-plus
     license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1024
         end_line: 1024
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1028
         end_line: 1028
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1032
         end_line: 1032
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1036
         end_line: 1036
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 1040
         end_line: 1040
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_299.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_299.RULE
         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+'
     identifier: gpl_3_0_plus_and_lgpl_2_1_plus-d232e3ee-7ec1-e56b-a14e-06d8be46d430
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1047
         end_line: 1047
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-3db4dd23-3c11-6f74-b73d-79f8b0d2d48b
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1052
         end_line: 1052
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1056
         end_line: 1056
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-6f74e383-639f-5369-8d93-48aa1ec12853
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1061
         end_line: 1061
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1065
         end_line: 1065
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 1069
         end_line: 1069
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_112.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_112.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE
         matched_text: 'License: GPLv3+'
     identifier: gpl_3_0_plus-b9c2bb21-041b-aefb-84f5-ecb3fa0c78f4
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1074
         end_line: 1074
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_195.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_195.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE
         matched_text: 'License: BSD-3-Clause'
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1077
         end_line: 1097
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 206
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1066.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1066.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1066.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 c4e699aca30..edece5621b5 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
@@ -31,17 +31,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 57
         end_line: 63
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -55,30 +55,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 65
         end_line: 65
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 66
         end_line: 81
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_390.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_390.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_390.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -101,30 +101,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 83
         end_line: 83
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 84
         end_line: 98
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_385.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_385.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_385.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -146,17 +146,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 101
         end_line: 124
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_910.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_910.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_910.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 4882caf643f..c08418c8691 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
@@ -27,17 +27,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
       AND CC-BY-SA-3.0
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 18
         end_line: 39
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -62,17 +62,17 @@ license_detections:
           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
+        from_file:
         start_line: 41
         end_line: 52
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: generic-export-compliance
-        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
-        rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
+        rule_identifier: generic-export-compliance_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
         matched_text: |
           Downloading of this software may constitute an export of cryptographic
@@ -87,17 +87,17 @@ license_detections:
           certain countries and individuals, including, but not limited to, the
           countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and
           nationals of those countries.
-      - score: '100.0'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: 54
         end_line: 56
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
         matched_text: |
           Documentation components of this software distribution are licensed
@@ -107,17 +107,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 64
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_136.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
         matched_text: |
           No commercial use of these trademarks may be made without
@@ -131,17 +131,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 82
         end_line: 111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 244
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_80.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
         matched_text: |
           WARNING:  Retrieving the OpenVision Kerberos Administration system
@@ -178,17 +178,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '98.73'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 128
         end_line: 146
-        from_file:
+        matcher: 2-aho
+        score: '98.73'
         matched_length: 155
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -214,17 +214,17 @@ license_detections:
   - license_expression: brian-gladman-3-clause
     license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
-      - score: '100.0'
+      - license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
+        from_file:
         start_line: 156
         end_line: 175
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 117
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: brian-gladman-3-clause
-        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
-        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
+        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
         matched_text: |
           LICENSE TERMS
@@ -251,17 +251,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 187
         end_line: 214
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_587.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 222
         end_line: 240
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -332,17 +332,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 248
         end_line: 272
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -374,17 +374,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 334
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -410,17 +410,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 363
         end_line: 390
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -455,17 +455,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 400
         end_line: 427
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_588.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -500,17 +500,17 @@ license_detections:
   - license_expression: michigan-disclaimer
     license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
+        from_file:
         start_line: 440
         end_line: 459
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 186
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: michigan-disclaimer
-        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
-        rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
+        rule_identifier: michigan-disclaimer.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
         matched_text: |
           Permission is granted to use, copy, create derivative works and
@@ -537,17 +537,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 469
         end_line: 476
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -562,17 +562,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 485
         end_line: 503
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -598,17 +598,17 @@ license_detections:
   - license_expression: openldap-2.8
     license_expression_spdx: OLDAP-2.8
     matches:
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 511
         end_line: 558
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 330
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
+        rule_identifier: openldap-2.8.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
         matched_text: |
           The OpenLDAP Public License
@@ -663,17 +663,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 568
         end_line: 595
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -708,17 +708,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 608
         end_line: 636
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_151.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -754,17 +754,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 647
         end_line: 675
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_589.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -800,17 +800,17 @@ license_detections:
   - license_expression: freebsd-doc
     license_expression_spdx: FreeBSD-DOC
     matches:
-      - score: '100.0'
+      - license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
+        from_file:
         start_line: 682
         end_line: 705
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: freebsd-doc
-        spdx_license_expression: FreeBSD-DOC
-        rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
+        rule_identifier: freebsd-doc_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -841,17 +841,17 @@ license_detections:
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
-      - score: '99.0'
+      - license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
+        from_file:
         start_line: 713
         end_line: 729
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cmu-uc
-        spdx_license_expression: MIT-CMU
-        rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
+        rule_identifier: cmu-uc_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -875,17 +875,17 @@ license_detections:
   - license_expression: nrl-permission
     license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
-      - score: '95.0'
+      - license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
+        from_file:
         start_line: 735
         end_line: 743
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nrl-permission
-        spdx_license_expression: LicenseRef-scancode-nrl-permission
-        rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
+        rule_identifier: nrl-permission_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
         matched_text: |
           Permission to use, copy, modify and distribute this software and
@@ -901,17 +901,17 @@ license_detections:
   - license_expression: ietf-trust
     license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
-      - score: '100.0'
+      - license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
+        from_file:
         start_line: 752
         end_line: 763
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf-trust
-        spdx_license_expression: LicenseRef-scancode-ietf-trust
-        rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
+        rule_identifier: ietf-trust_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
         matched_text: |
           This document is subject to the rights, licenses and restrictions
@@ -930,17 +930,17 @@ license_detections:
   - license_expression: mit-old-style
     license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
+        from_file:
         start_line: 769
         end_line: 776
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 69
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style
-        spdx_license_expression: LicenseRef-scancode-mit-old-style
-        rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -955,17 +955,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 782
         end_line: 800
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -992,17 +992,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
       AND LicenseRef-scancode-proprietary-license)
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 810
         end_line: 833
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1029,17 +1029,17 @@ 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.
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 837
         end_line: 856
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control AND proprietary-license
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
-        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
         matched_text: |
           EXPORT OF THIS SOFTWARE from the United States of America may
@@ -1066,17 +1066,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 866
         end_line: 899
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1117,17 +1117,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '99.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 907
         end_line: 922
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
+        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1150,17 +1150,17 @@ license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 934
         end_line: 968
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 245
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1202,17 +1202,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 978
         end_line: 996
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_483.RULE
         rule_relevance: 100
+        rule_identifier: mit_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -1238,17 +1238,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1004
         end_line: 1016
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1268,17 +1268,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '95.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1025
         end_line: 1037
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_16.RULE
         rule_relevance: 95
+        rule_identifier: isc_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1298,17 +1298,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1046
         end_line: 1047
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
         matched_text: |
           This file may be freely redistributed without license or fee
@@ -1317,17 +1317,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1060
         end_line: 1087
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_134.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1362,17 +1362,17 @@ license_detections:
   - license_expression: rsa-md4
     license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
+        from_file:
         start_line: 1096
         end_line: 1112
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md4
-        spdx_license_expression: LicenseRef-scancode-rsa-md4
-        rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md4.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1396,17 +1396,17 @@ license_detections:
   - license_expression: rsa-md5
     license_expression_spdx: RSA-MD
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
+        from_file:
         start_line: 1121
         end_line: 1137
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md5
-        spdx_license_expression: RSA-MD
-        rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md5.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1430,17 +1430,17 @@ license_detections:
   - license_expression: rsa-1990
     license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
-      - score: '100.0'
+      - license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
+        from_file:
         start_line: 1147
         end_line: 1153
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-1990
-        spdx_license_expression: LicenseRef-scancode-rsa-1990
-        rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-1990.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
         matched_text: |
           RSA Data Security, Inc. makes no representations concerning either
@@ -1454,17 +1454,17 @@ license_detections:
   - license_expression: mit-with-modification-obligations
     license_expression_spdx: HPND-export-US-modify
     matches:
-      - score: '100.0'
+      - license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
+        from_file:
         start_line: 1163
         end_line: 1181
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 177
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-with-modification-obligations
-        spdx_license_expression: HPND-export-US-modify
-        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1490,17 +1490,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1190
         end_line: 1217
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_590.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1535,17 +1535,17 @@ license_detections:
   - license_expression: bsd-simplified OR gpl-2.0-plus
     license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
+        from_file:
         start_line: 1226
         end_line: 1264
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 335
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified OR gpl-2.0-plus
-        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
-        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1591,17 +1591,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1274
         end_line: 1302
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1637,17 +1637,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1311
         end_line: 1334
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 48a1156afa9..91ce4a9a7dd 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
@@ -196,30 +196,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 276
         end_line: 276
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 277
         end_line: 293
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_460.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_460.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_460.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -243,30 +243,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus AND gpl-3.0-plus WITH tex-exception
     license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 489
         end_line: 489
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH tex-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
+        from_file:
         start_line: 490
         end_line: 505
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH tex-exception
-        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
-        rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_tex-exception_5.RULE
         matched_text: |
           This texinfo.tex file is free software: you can redistribute it and/or
@@ -289,17 +289,17 @@ other_license_detections:
   - license_expression: autoconf-simple-exception-2.0
     license_expression_spdx: Autoconf-exception-generic
     matches:
-      - score: '100.0'
+      - license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
+        from_file:
         start_line: 525
         end_line: 528
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: autoconf-simple-exception-2.0
-        spdx_license_expression: Autoconf-exception-generic
-        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
         matched_text: |
           As a special exception to the GNU General Public License, if you
@@ -310,17 +310,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 533
         end_line: 534
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_354.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_354.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_354.RULE
         matched_text: |
           I believe that most files in debian/ hardly contains any creative
@@ -329,30 +329,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 539
         end_line: 539
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 540
         end_line: 556
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 131
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1155.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1155.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1155.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -376,17 +376,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 565
         end_line: 567
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_3.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_3.RULE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -396,30 +396,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 569
         end_line: 569
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 570
         end_line: 585
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_196.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_196.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_196.RULE
         matched_text: |
           The nettle library is free software; you can redistribute it and/or modify
@@ -442,30 +442,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 587
         end_line: 587
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 588
         end_line: 605
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 140
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_857.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_857.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_857.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -490,17 +490,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 608
         end_line: 625
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -528,18 +528,18 @@ other_license_detections:
       AND LicenseRef-scancode-public-domain) AND LicenseRef-scancode-public-domain AND LGPL-2.0-or-later
       AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - 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
+          AND LicenseRef-scancode-public-domain
+        from_file:
         start_line: 10
         end_line: 16
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 79
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          AND LicenseRef-scancode-public-domain
-        rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         matched_text: |
           Nettle is dual licenced under the GNU General Public License version
@@ -549,153 +549,153 @@ other_license_detections:
           licensed under more permissive terms, or in the public domain. To
           find the current status of particular files, you have to read the
           copyright notices at the top of the files.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 55
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_515.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_515.RULE
         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.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 60
         end_line: 60
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1090.RULE
         rule_relevance: 100
+        rule_identifier: mit_1090.RULE
         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.
-      - score: '100.0'
+      - license_expression: pycrypto
+        spdx_license_expression: LicenseRef-scancode-pycrypto
+        from_file:
         start_line: 64
         end_line: 65
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pycrypto
-        spdx_license_expression: LicenseRef-scancode-pycrypto
-        rule_identifier: pycrypto_1.RULE
         rule_relevance: 100
+        rule_identifier: pycrypto_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pycrypto_1.RULE
         matched_text: |
           Python Cryptography
               Toolkit license (essentially public domain).
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 69
         end_line: 69
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 74
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 81
         end_line: 82
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
         matched_text: |
           based on the code
               in libgcrypt, copyright owned by the Free Software Foundation.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 87
         end_line: 87
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_425.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_425.RULE
         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),
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 92
         end_line: 93
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
         matched_text: |
           based on the code in
               libgcrypt, copyright owned by the Free Software Foundation.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 105
         end_line: 105
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 106
         end_line: 106
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_465.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_465.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_465.RULE
         matched_text: released under the LGPL.
     identifier: gpl_2_0_plus_or_gpl_3_0_plus__and_other_permissive_and_public_domain__and_public_domain_and_lgpl_2_0_plus_and_mit_and_pycrypto_and_lgpl_2_1_plus-14e5a124-078d-9ad2-fd6e-8e31e8ec569e
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 8f030a880dc..4c41ca3ac8e 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
@@ -22,30 +22,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 28
         end_line: 28
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 29
         end_line: 43
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_288.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_288.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_288.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -67,30 +67,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 45
         end_line: 45
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 46
         end_line: 60
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_740.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_740.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_740.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -112,30 +112,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 62
         end_line: 62
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 63
         end_line: 77
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 131
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_242.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_242.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_242.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -157,30 +157,30 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 80
         end_line: 80
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_14.RULE
         rule_relevance: 100
+        rule_identifier: unicode_14.RULE
         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
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 81
         end_line: 113
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 309
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_17.RULE
         rule_relevance: 100
+        rule_identifier: unicode_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_17.RULE
         matched_text: |
           Distributed
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 4882caf643f..c08418c8691 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
@@ -27,17 +27,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
       AND CC-BY-SA-3.0
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 18
         end_line: 39
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -62,17 +62,17 @@ license_detections:
           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
+        from_file:
         start_line: 41
         end_line: 52
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: generic-export-compliance
-        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
-        rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
+        rule_identifier: generic-export-compliance_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
         matched_text: |
           Downloading of this software may constitute an export of cryptographic
@@ -87,17 +87,17 @@ license_detections:
           certain countries and individuals, including, but not limited to, the
           countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and
           nationals of those countries.
-      - score: '100.0'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: 54
         end_line: 56
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
         matched_text: |
           Documentation components of this software distribution are licensed
@@ -107,17 +107,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 64
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_136.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
         matched_text: |
           No commercial use of these trademarks may be made without
@@ -131,17 +131,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 82
         end_line: 111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 244
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_80.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
         matched_text: |
           WARNING:  Retrieving the OpenVision Kerberos Administration system
@@ -178,17 +178,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '98.73'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 128
         end_line: 146
-        from_file:
+        matcher: 2-aho
+        score: '98.73'
         matched_length: 155
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -214,17 +214,17 @@ license_detections:
   - license_expression: brian-gladman-3-clause
     license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
-      - score: '100.0'
+      - license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
+        from_file:
         start_line: 156
         end_line: 175
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 117
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: brian-gladman-3-clause
-        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
-        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
+        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
         matched_text: |
           LICENSE TERMS
@@ -251,17 +251,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 187
         end_line: 214
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_587.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 222
         end_line: 240
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -332,17 +332,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 248
         end_line: 272
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -374,17 +374,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 334
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -410,17 +410,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 363
         end_line: 390
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -455,17 +455,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 400
         end_line: 427
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_588.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -500,17 +500,17 @@ license_detections:
   - license_expression: michigan-disclaimer
     license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
+        from_file:
         start_line: 440
         end_line: 459
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 186
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: michigan-disclaimer
-        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
-        rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
+        rule_identifier: michigan-disclaimer.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
         matched_text: |
           Permission is granted to use, copy, create derivative works and
@@ -537,17 +537,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 469
         end_line: 476
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -562,17 +562,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 485
         end_line: 503
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -598,17 +598,17 @@ license_detections:
   - license_expression: openldap-2.8
     license_expression_spdx: OLDAP-2.8
     matches:
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 511
         end_line: 558
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 330
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
+        rule_identifier: openldap-2.8.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
         matched_text: |
           The OpenLDAP Public License
@@ -663,17 +663,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 568
         end_line: 595
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -708,17 +708,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 608
         end_line: 636
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_151.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -754,17 +754,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 647
         end_line: 675
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_589.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -800,17 +800,17 @@ license_detections:
   - license_expression: freebsd-doc
     license_expression_spdx: FreeBSD-DOC
     matches:
-      - score: '100.0'
+      - license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
+        from_file:
         start_line: 682
         end_line: 705
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: freebsd-doc
-        spdx_license_expression: FreeBSD-DOC
-        rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
+        rule_identifier: freebsd-doc_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -841,17 +841,17 @@ license_detections:
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
-      - score: '99.0'
+      - license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
+        from_file:
         start_line: 713
         end_line: 729
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cmu-uc
-        spdx_license_expression: MIT-CMU
-        rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
+        rule_identifier: cmu-uc_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -875,17 +875,17 @@ license_detections:
   - license_expression: nrl-permission
     license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
-      - score: '95.0'
+      - license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
+        from_file:
         start_line: 735
         end_line: 743
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nrl-permission
-        spdx_license_expression: LicenseRef-scancode-nrl-permission
-        rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
+        rule_identifier: nrl-permission_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
         matched_text: |
           Permission to use, copy, modify and distribute this software and
@@ -901,17 +901,17 @@ license_detections:
   - license_expression: ietf-trust
     license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
-      - score: '100.0'
+      - license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
+        from_file:
         start_line: 752
         end_line: 763
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf-trust
-        spdx_license_expression: LicenseRef-scancode-ietf-trust
-        rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
+        rule_identifier: ietf-trust_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
         matched_text: |
           This document is subject to the rights, licenses and restrictions
@@ -930,17 +930,17 @@ license_detections:
   - license_expression: mit-old-style
     license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
+        from_file:
         start_line: 769
         end_line: 776
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 69
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style
-        spdx_license_expression: LicenseRef-scancode-mit-old-style
-        rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -955,17 +955,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 782
         end_line: 800
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -992,17 +992,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
       AND LicenseRef-scancode-proprietary-license)
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 810
         end_line: 833
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1029,17 +1029,17 @@ 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.
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 837
         end_line: 856
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control AND proprietary-license
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
-        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
         matched_text: |
           EXPORT OF THIS SOFTWARE from the United States of America may
@@ -1066,17 +1066,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 866
         end_line: 899
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1117,17 +1117,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '99.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 907
         end_line: 922
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
+        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1150,17 +1150,17 @@ license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 934
         end_line: 968
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 245
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1202,17 +1202,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 978
         end_line: 996
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_483.RULE
         rule_relevance: 100
+        rule_identifier: mit_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -1238,17 +1238,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1004
         end_line: 1016
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1268,17 +1268,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '95.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1025
         end_line: 1037
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_16.RULE
         rule_relevance: 95
+        rule_identifier: isc_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1298,17 +1298,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1046
         end_line: 1047
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
         matched_text: |
           This file may be freely redistributed without license or fee
@@ -1317,17 +1317,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1060
         end_line: 1087
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_134.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1362,17 +1362,17 @@ license_detections:
   - license_expression: rsa-md4
     license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
+        from_file:
         start_line: 1096
         end_line: 1112
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md4
-        spdx_license_expression: LicenseRef-scancode-rsa-md4
-        rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md4.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1396,17 +1396,17 @@ license_detections:
   - license_expression: rsa-md5
     license_expression_spdx: RSA-MD
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
+        from_file:
         start_line: 1121
         end_line: 1137
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md5
-        spdx_license_expression: RSA-MD
-        rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md5.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1430,17 +1430,17 @@ license_detections:
   - license_expression: rsa-1990
     license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
-      - score: '100.0'
+      - license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
+        from_file:
         start_line: 1147
         end_line: 1153
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-1990
-        spdx_license_expression: LicenseRef-scancode-rsa-1990
-        rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-1990.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
         matched_text: |
           RSA Data Security, Inc. makes no representations concerning either
@@ -1454,17 +1454,17 @@ license_detections:
   - license_expression: mit-with-modification-obligations
     license_expression_spdx: HPND-export-US-modify
     matches:
-      - score: '100.0'
+      - license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
+        from_file:
         start_line: 1163
         end_line: 1181
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 177
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-with-modification-obligations
-        spdx_license_expression: HPND-export-US-modify
-        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1490,17 +1490,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1190
         end_line: 1217
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_590.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1535,17 +1535,17 @@ license_detections:
   - license_expression: bsd-simplified OR gpl-2.0-plus
     license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
+        from_file:
         start_line: 1226
         end_line: 1264
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 335
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified OR gpl-2.0-plus
-        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
-        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1591,17 +1591,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1274
         end_line: 1302
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1637,17 +1637,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1311
         end_line: 1334
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 1a28e57781f..3031eef8ca3 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
@@ -15,30 +15,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 20
         end_line: 20
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 21
         end_line: 35
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 122
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_983.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_983.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_983.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -60,30 +60,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 37
         end_line: 37
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 38
         end_line: 52
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
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 4882caf643f..c08418c8691 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
@@ -27,17 +27,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND LicenseRef-scancode-generic-export-compliance
       AND CC-BY-SA-3.0
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 18
         end_line: 39
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -62,17 +62,17 @@ license_detections:
           THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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.
-      - score: '100.0'
+      - license_expression: generic-export-compliance
+        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
+        from_file:
         start_line: 41
         end_line: 52
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 104
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: generic-export-compliance
-        spdx_license_expression: LicenseRef-scancode-generic-export-compliance
-        rule_identifier: generic-export-compliance_3.RULE
         rule_relevance: 100
+        rule_identifier: generic-export-compliance_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/generic-export-compliance_3.RULE
         matched_text: |
           Downloading of this software may constitute an export of cryptographic
@@ -87,17 +87,17 @@ license_detections:
           certain countries and individuals, including, but not limited to, the
           countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and
           nationals of those countries.
-      - score: '100.0'
+      - license_expression: cc-by-sa-3.0
+        spdx_license_expression: CC-BY-SA-3.0
+        from_file:
         start_line: 54
         end_line: 56
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cc-by-sa-3.0
-        spdx_license_expression: CC-BY-SA-3.0
-        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_relevance: 100
+        rule_identifier: cc-by-sa-3.0_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_22.RULE
         matched_text: |
           Documentation components of this software distribution are licensed
@@ -107,17 +107,17 @@ license_detections:
   - license_expression: proprietary-license
     license_expression_spdx: LicenseRef-scancode-proprietary-license
     matches:
-      - score: '100.0'
+      - license_expression: proprietary-license
+        spdx_license_expression: LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 64
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: proprietary-license
-        spdx_license_expression: LicenseRef-scancode-proprietary-license
-        rule_identifier: proprietary-license_136.RULE
         rule_relevance: 100
+        rule_identifier: proprietary-license_136.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/proprietary-license_136.RULE
         matched_text: |
           No commercial use of these trademarks may be made without
@@ -131,17 +131,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 82
         end_line: 111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 244
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_80.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_80.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_80.RULE
         matched_text: |
           WARNING:  Retrieving the OpenVision Kerberos Administration system
@@ -178,17 +178,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '98.73'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 128
         end_line: 146
-        from_file:
+        matcher: 2-aho
+        score: '98.73'
         matched_length: 155
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_1.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -214,17 +214,17 @@ license_detections:
   - license_expression: brian-gladman-3-clause
     license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause
     matches:
-      - score: '100.0'
+      - license_expression: brian-gladman-3-clause
+        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
+        from_file:
         start_line: 156
         end_line: 175
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 117
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: brian-gladman-3-clause
-        spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause
-        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_relevance: 100
+        rule_identifier: brian-gladman-3-clause_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/brian-gladman-3-clause_2.RULE
         matched_text: |
           LICENSE TERMS
@@ -251,17 +251,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 187
         end_line: 214
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_587.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_587.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_587.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 222
         end_line: 240
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -332,17 +332,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 248
         end_line: 272
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_20.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_20.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -374,17 +374,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 334
         end_line: 352
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -410,17 +410,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 363
         end_line: 390
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -455,17 +455,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 400
         end_line: 427
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 205
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_588.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_588.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_588.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -500,17 +500,17 @@ license_detections:
   - license_expression: michigan-disclaimer
     license_expression_spdx: LicenseRef-scancode-michigan-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: michigan-disclaimer
+        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
+        from_file:
         start_line: 440
         end_line: 459
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 186
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: michigan-disclaimer
-        spdx_license_expression: LicenseRef-scancode-michigan-disclaimer
-        rule_identifier: michigan-disclaimer.LICENSE
         rule_relevance: 100
+        rule_identifier: michigan-disclaimer.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/michigan-disclaimer.LICENSE
         matched_text: |
           Permission is granted to use, copy, create derivative works and
@@ -537,17 +537,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 469
         end_line: 476
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -562,17 +562,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 485
         end_line: 503
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 159
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -598,17 +598,17 @@ license_detections:
   - license_expression: openldap-2.8
     license_expression_spdx: OLDAP-2.8
     matches:
-      - score: '100.0'
+      - license_expression: openldap-2.8
+        spdx_license_expression: OLDAP-2.8
+        from_file:
         start_line: 511
         end_line: 558
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 330
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: openldap-2.8
-        spdx_license_expression: OLDAP-2.8
-        rule_identifier: openldap-2.8.LICENSE
         rule_relevance: 100
+        rule_identifier: openldap-2.8.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/openldap-2.8.LICENSE
         matched_text: |
           The OpenLDAP Public License
@@ -663,17 +663,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 568
         end_line: 595
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_933.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_933.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_933.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -708,17 +708,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 608
         end_line: 636
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_151.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_151.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_151.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -754,17 +754,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 647
         end_line: 675
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_589.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_589.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_589.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -800,17 +800,17 @@ license_detections:
   - license_expression: freebsd-doc
     license_expression_spdx: FreeBSD-DOC
     matches:
-      - score: '100.0'
+      - license_expression: freebsd-doc
+        spdx_license_expression: FreeBSD-DOC
+        from_file:
         start_line: 682
         end_line: 705
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 185
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: freebsd-doc
-        spdx_license_expression: FreeBSD-DOC
-        rule_identifier: freebsd-doc_5.RULE
         rule_relevance: 100
+        rule_identifier: freebsd-doc_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/freebsd-doc_5.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -841,17 +841,17 @@ license_detections:
   - license_expression: cmu-uc
     license_expression_spdx: MIT-CMU
     matches:
-      - score: '99.0'
+      - license_expression: cmu-uc
+        spdx_license_expression: MIT-CMU
+        from_file:
         start_line: 713
         end_line: 729
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: cmu-uc
-        spdx_license_expression: MIT-CMU
-        rule_identifier: cmu-uc_12.RULE
         rule_relevance: 99
+        rule_identifier: cmu-uc_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cmu-uc_12.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -875,17 +875,17 @@ license_detections:
   - license_expression: nrl-permission
     license_expression_spdx: LicenseRef-scancode-nrl-permission
     matches:
-      - score: '95.0'
+      - license_expression: nrl-permission
+        spdx_license_expression: LicenseRef-scancode-nrl-permission
+        from_file:
         start_line: 735
         end_line: 743
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: nrl-permission
-        spdx_license_expression: LicenseRef-scancode-nrl-permission
-        rule_identifier: nrl-permission_1.RULE
         rule_relevance: 95
+        rule_identifier: nrl-permission_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/nrl-permission_1.RULE
         matched_text: |
           Permission to use, copy, modify and distribute this software and
@@ -901,17 +901,17 @@ license_detections:
   - license_expression: ietf-trust
     license_expression_spdx: LicenseRef-scancode-ietf-trust
     matches:
-      - score: '100.0'
+      - license_expression: ietf-trust
+        spdx_license_expression: LicenseRef-scancode-ietf-trust
+        from_file:
         start_line: 752
         end_line: 763
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 99
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ietf-trust
-        spdx_license_expression: LicenseRef-scancode-ietf-trust
-        rule_identifier: ietf-trust_10.RULE
         rule_relevance: 100
+        rule_identifier: ietf-trust_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/ietf-trust_10.RULE
         matched_text: |
           This document is subject to the rights, licenses and restrictions
@@ -930,17 +930,17 @@ license_detections:
   - license_expression: mit-old-style
     license_expression_spdx: LicenseRef-scancode-mit-old-style
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style
+        spdx_license_expression: LicenseRef-scancode-mit-old-style
+        from_file:
         start_line: 769
         end_line: 776
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 69
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style
-        spdx_license_expression: LicenseRef-scancode-mit-old-style
-        rule_identifier: mit-old-style_11.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_11.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -955,17 +955,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 782
         end_line: 800
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -992,17 +992,17 @@ license_detections:
     license_expression_spdx: BSD-2-Clause AND (LicenseRef-scancode-mit-no-advert-export-control
       AND LicenseRef-scancode-proprietary-license)
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 810
         end_line: 833
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1029,17 +1029,17 @@ 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.
-      - score: '100.0'
+      - license_expression: mit-no-advert-export-control AND proprietary-license
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
+        from_file:
         start_line: 837
         end_line: 856
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control AND proprietary-license
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control AND LicenseRef-scancode-proprietary-license
-        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_relevance: 100
+        rule_identifier: mit-no-advert-export-control_and_proprietary-license_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_and_proprietary-license_1.RULE
         matched_text: |
           EXPORT OF THIS SOFTWARE from the United States of America may
@@ -1066,17 +1066,17 @@ license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 866
         end_line: 899
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1117,17 +1117,17 @@ license_detections:
   - license_expression: mit-no-advert-export-control
     license_expression_spdx: LicenseRef-scancode-mit-no-advert-export-control
     matches:
-      - score: '99.0'
+      - license_expression: mit-no-advert-export-control
+        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
+        from_file:
         start_line: 907
         end_line: 922
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-no-advert-export-control
-        spdx_license_expression: LicenseRef-scancode-mit-no-advert-export-control
-        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_relevance: 99
+        rule_identifier: mit-no-advert-export-control_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-no-advert-export-control_4.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1150,17 +1150,17 @@ license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 934
         end_line: 968
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 245
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_32.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_32.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1202,17 +1202,17 @@ license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 978
         end_line: 996
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_483.RULE
         rule_relevance: 100
+        rule_identifier: mit_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_483.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -1238,17 +1238,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1004
         end_line: 1016
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 111
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_14.RULE
         rule_relevance: 100
+        rule_identifier: isc_14.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_14.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1268,17 +1268,17 @@ license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '95.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 1025
         end_line: 1037
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_16.RULE
         rule_relevance: 95
+        rule_identifier: isc_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_16.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for
@@ -1298,17 +1298,17 @@ license_detections:
   - license_expression: other-permissive
     license_expression_spdx: LicenseRef-scancode-other-permissive
     matches:
-      - score: '100.0'
+      - license_expression: other-permissive
+        spdx_license_expression: LicenseRef-scancode-other-permissive
+        from_file:
         start_line: 1046
         end_line: 1047
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive
-        spdx_license_expression: LicenseRef-scancode-other-permissive
-        rule_identifier: other-permissive_22.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_22.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_22.RULE
         matched_text: |
           This file may be freely redistributed without license or fee
@@ -1317,17 +1317,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1060
         end_line: 1087
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_134.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_134.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_134.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1362,17 +1362,17 @@ license_detections:
   - license_expression: rsa-md4
     license_expression_spdx: LicenseRef-scancode-rsa-md4
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md4
+        spdx_license_expression: LicenseRef-scancode-rsa-md4
+        from_file:
         start_line: 1096
         end_line: 1112
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md4
-        spdx_license_expression: LicenseRef-scancode-rsa-md4
-        rule_identifier: rsa-md4.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md4.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md4.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1396,17 +1396,17 @@ license_detections:
   - license_expression: rsa-md5
     license_expression_spdx: RSA-MD
     matches:
-      - score: '100.0'
+      - license_expression: rsa-md5
+        spdx_license_expression: RSA-MD
+        from_file:
         start_line: 1121
         end_line: 1137
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-md5
-        spdx_license_expression: RSA-MD
-        rule_identifier: rsa-md5.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-md5.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-md5.LICENSE
         matched_text: |
           License to copy and use this software is granted provided that it
@@ -1430,17 +1430,17 @@ license_detections:
   - license_expression: rsa-1990
     license_expression_spdx: LicenseRef-scancode-rsa-1990
     matches:
-      - score: '100.0'
+      - license_expression: rsa-1990
+        spdx_license_expression: LicenseRef-scancode-rsa-1990
+        from_file:
         start_line: 1147
         end_line: 1153
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 54
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: rsa-1990
-        spdx_license_expression: LicenseRef-scancode-rsa-1990
-        rule_identifier: rsa-1990.LICENSE
         rule_relevance: 100
+        rule_identifier: rsa-1990.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/rsa-1990.LICENSE
         matched_text: |
           RSA Data Security, Inc. makes no representations concerning either
@@ -1454,17 +1454,17 @@ license_detections:
   - license_expression: mit-with-modification-obligations
     license_expression_spdx: HPND-export-US-modify
     matches:
-      - score: '100.0'
+      - license_expression: mit-with-modification-obligations
+        spdx_license_expression: HPND-export-US-modify
+        from_file:
         start_line: 1163
         end_line: 1181
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 177
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-with-modification-obligations
-        spdx_license_expression: HPND-export-US-modify
-        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_relevance: 100
+        rule_identifier: mit-with-modification-obligations_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-with-modification-obligations_2.RULE
         matched_text: |
           Export of this software from the United States of America may
@@ -1490,17 +1490,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1190
         end_line: 1217
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_590.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_590.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_590.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1535,17 +1535,17 @@ license_detections:
   - license_expression: bsd-simplified OR gpl-2.0-plus
     license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified OR gpl-2.0-plus
+        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
+        from_file:
         start_line: 1226
         end_line: 1264
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 335
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified OR gpl-2.0-plus
-        spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later
-        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_or_gpl-2.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_or_gpl-2.0-plus_7.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1591,17 +1591,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1274
         end_line: 1302
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 212
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-intel_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-intel_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-intel_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1637,17 +1637,17 @@ license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 1311
         end_line: 1334
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 7aaf9bbfbb5..77fff7073b1 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
@@ -31,30 +31,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 64
         end_line: 64
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 65
         end_line: 70
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 59
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1296.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1296.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1296.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -67,30 +67,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 72
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 73
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_985.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_985.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_985.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -104,17 +104,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 82
         end_line: 101
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 2287b083942..9cbdd94a93f 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
@@ -67,160 +67,160 @@ other_license_detections:
       (LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft) AND LicenseRef-scancode-public-domain-disclaimer
       AND (LGPL-2.1-only AND GPL-2.0-only AND GPL-3.0-only)
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 23
         end_line: 23
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_285.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_285.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 25
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_431.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_431.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_431.RULE
         matched_text: |
           command line tools are in the public
               domain
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 27
         end_line: 28
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_393.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_393.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_393.RULE
         matched_text: |
           The getopt_long code is under
               GNU LGPLv2.1+.
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 31
         end_line: 32
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 9
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_991.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_991.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_991.RULE
         matched_text: |
           These scripts and their documentation are
               under GNU GPLv2+.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 35
         end_line: 36
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_428.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_428.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_428.RULE
         matched_text: |
           documentation files in other directories
               are in the public domain.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 38
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_429.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_429.RULE
         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.
-      - score: '100.0'
+      - 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
+          GPL-3.0-or-later
+        from_file:
         start_line: 40
         end_line: 41
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          GPL-3.0-or-later
-        rule_identifier: public-domain_and_gpl-2.0-plus_and_gpl-3.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_and_gpl-2.0-plus_and_gpl-3.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_and_gpl-2.0-plus_and_gpl-3.0-plus_1.RULE
         matched_text: |
           The build system contains public domain files, and files that
               are under GNU GPLv2+ or GNU GPLv3+.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 45
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_305.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_305.RULE
         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.
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain
-      - score: '100.0'
+      - license_expression: other-permissive AND other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 47
         end_line: 48
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: other-permissive AND other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
-        rule_identifier: other-permissive_and_other-copyleft_4.RULE
         rule_relevance: 100
+        rule_identifier: other-permissive_and_other-copyleft_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_other-copyleft_4.RULE
         matched_text: |
           files
               that are under various free software licenses.
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 50
         end_line: 64
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_72.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_72.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_72.RULE
         matched_text: |
           You can do whatever you want with the files that have been put into
@@ -238,64 +238,64 @@ other_license_detections:
           notice to put into "about box" or into documentation:
 
               This software includes code from XZ Utils .
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 66
         end_line: 69
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.1_and_gpl-2.0_and_gpl-3.0_3.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_and_gpl-2.0_and_gpl-3.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_and_gpl-2.0_and_gpl-3.0_3.RULE
         matched_text: |
           The following license texts are included in the following files:
             - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1
             - COPYING.GPLv2: GNU General Public License version 2
             - COPYING.GPLv3: GNU General Public License version 3
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 73
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_427.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_427.RULE
         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
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 12
         end_line: 12
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_430.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_430.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_430.RULE
         matched_text: Most of the source has been put into the public domain,
     identifier: public_domain_and_lgpl_2_1_plus_and_gpl_2_0_plus_and__public_domain_and_gpl_2_0_plus_and_gpl_3_0_plus__and__other_permissive_and_other_copyleft__and_public_domain_disclaimer_and__lgpl_2_1_and_gpl_2_0_and_gpl_3_0-4691a091-f632-d529-3371-6ce2e75116fe
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 90
         end_line: 91
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_353.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_353.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_353.RULE
         matched_text: |
           This file has been put in the public domain.
@@ -304,34 +304,34 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '55.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 120
         end_line: 120
-        from_file:
+        matcher: 1-hash
+        score: '55.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_356.RULE
         rule_relevance: 55
+        rule_identifier: public-domain_356.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_356.RULE
         matched_text: See the note on AUTHORS, README, and so on above.
     identifier: public_domain-2edfee4d-b020-5521-fa21-9f147003edee
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 136
         end_line: 137
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_353.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_353.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_353.RULE
         matched_text: |
           This file has been put in the public domain.
@@ -340,68 +340,68 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 142
         end_line: 142
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_219.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_219.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_219.RULE
         matched_text: Not copyrighted -- provided to the public domain.
     identifier: public_domain-343d857e-4460-3363-2dc0-930ea3e9e84b
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 180
         end_line: 180
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_355.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_355.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_355.RULE
         matched_text: No copyright to license.
     identifier: public_domain-7b6ed7b8-456a-38b3-d0e8-9234afee9fbe
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 185
         end_line: 185
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_355.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_355.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_355.RULE
         matched_text: No copyright to license.
     identifier: public_domain-7b6ed7b8-456a-38b3-d0e8-9234afee9fbe
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: '191'
         end_line: '192'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_47.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_47.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_47.RULE
         matched_text: |
           This file has been put into the public domain.
@@ -410,34 +410,34 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 209
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_66.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_66.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_66.RULE
         matched_text: This file is put in the public domain.
     identifier: public_domain-988843f6-19e0-bdd4-e2c1-d0a899c8f5f7
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 217
         end_line: 217
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_50.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_50.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_50.RULE
         matched_text: This file is in the public domain
     identifier: public_domain-4b02eb33-5304-7130-8eb0-364fc26686a6
@@ -445,48 +445,48 @@ other_license_detections:
     license_expression_spdx: LicenseRef-scancode-public-domain AND FSFULLR AND Autoconf-exception-2.0
       AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 238
         end_line: 239
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_47.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_47.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_47.RULE
         matched_text: |
           This file has been put into the public domain.
            # You can do whatever you want with this file.
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 244
         end_line: 246
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
            dnl gives unlimited permission to copy and/or distribute it,
            dnl with or without modifications, as long as this notice is preserved.
-      - score: '100.0'
+      - license_expression: autoconf-exception-2.0
+        spdx_license_expression: Autoconf-exception-2.0
+        from_file:
         start_line: 257
         end_line: 263
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 72
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: autoconf-exception-2.0
-        spdx_license_expression: Autoconf-exception-2.0
-        rule_identifier: gpl-2.0-plus_with_autoconf-exception-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_autoconf-exception-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-exception-2.0_2.RULE
         matched_text: |
           As a special exception, the Free Software Foundation gives unlimited
@@ -496,17 +496,17 @@ other_license_detections:
            # though portions of the text of Autoconf appear in them.  The GNU
            # General Public License (GPL) does govern all other use of the material
            # that constitutes the Autoconf program.
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 265
         end_line: 266
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1120.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1120.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1120.RULE
         matched_text: |
           On Debian systems, the complete text of the GNU General Public
@@ -515,30 +515,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus AND (lgpl-2.0 AND lgpl-2.1)
     license_expression_spdx: LGPL-2.1-or-later AND (LGPL-2.0-only AND LGPL-2.1-only)
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 274
         end_line: 274
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '97.06'
+      - license_expression: lgpl-2.0 AND lgpl-2.1
+        spdx_license_expression: LGPL-2.0-only AND LGPL-2.1-only
+        from_file:
         start_line: 275
         end_line: 281
-        from_file:
+        matcher: 3-seq
+        score: '97.06'
         matched_length: 66
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: lgpl-2.0 AND lgpl-2.1
-        spdx_license_expression: LGPL-2.0-only AND LGPL-2.1-only
-        rule_identifier: lgpl-2.0_and_lgpl-2.1_1.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0_and_lgpl-2.1_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_lgpl-2.1_1.RULE
         matched_text: |
           The gettext-runtime package is under the LGPL, see files intl/COPYING.LIB-2.0
@@ -552,17 +552,17 @@ other_license_detections:
   - license_expression: other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
-      - score: '90.0'
+      - license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 289
         end_line: 290
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-copyleft
-        rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
+        rule_identifier: other-copyleft_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
         matched_text: |
           Everyone is permitted to copy and distribute verbatim copies
@@ -571,17 +571,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 295
         end_line: 296
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_360.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_360.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_360.RULE
         matched_text: |
           The Debian packaging files are in the public domain.
@@ -590,30 +590,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 298
         end_line: 298
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 299
         end_line: 314
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -636,30 +636,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 316
         end_line: 316
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 317
         end_line: 329
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1302.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1302.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1302.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and its
@@ -679,30 +679,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 331
         end_line: 331
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 332
         end_line: 347
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -725,17 +725,17 @@ other_license_detections:
   - license_expression: gpl-3.0-plus WITH autoconf-macro-exception
     license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-macro
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH autoconf-macro-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-macro
+        from_file:
         start_line: 350
         end_line: 377
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 252
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH autoconf-macro-exception
-        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-macro
-        rule_identifier: gpl-3.0-plus_with_autoconf-macro-exception_6.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_autoconf-macro-exception_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-macro-exception_6.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -770,17 +770,17 @@ other_license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 380
         end_line: 382
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -790,17 +790,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 385
         end_line: 388
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -811,47 +811,47 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 12
         end_line: 12
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_430.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_430.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_430.RULE
         matched_text: Most of the source has been put into the public domain,
     identifier: public_domain-be741e60-3c47-76c0-ca1d-9ba13449e98a
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 104
         end_line: 104
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_473.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_473.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 108
         end_line: 109
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_473.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_473.RULE
         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
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 48a1156afa9..91ce4a9a7dd 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
@@ -196,30 +196,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 276
         end_line: 276
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 277
         end_line: 293
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 143
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_460.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_460.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_460.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -243,30 +243,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus AND gpl-3.0-plus WITH tex-exception
     license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 489
         end_line: 489
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH tex-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
+        from_file:
         start_line: 490
         end_line: 505
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH tex-exception
-        spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception
-        rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_tex-exception_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_tex-exception_5.RULE
         matched_text: |
           This texinfo.tex file is free software: you can redistribute it and/or
@@ -289,17 +289,17 @@ other_license_detections:
   - license_expression: autoconf-simple-exception-2.0
     license_expression_spdx: Autoconf-exception-generic
     matches:
-      - score: '100.0'
+      - license_expression: autoconf-simple-exception-2.0
+        spdx_license_expression: Autoconf-exception-generic
+        from_file:
         start_line: 525
         end_line: 528
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 42
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: autoconf-simple-exception-2.0
-        spdx_license_expression: Autoconf-exception-generic
-        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_relevance: 100
+        rule_identifier: autoconf-simple-exception-2.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/autoconf-simple-exception-2.0.LICENSE
         matched_text: |
           As a special exception to the GNU General Public License, if you
@@ -310,17 +310,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 533
         end_line: 534
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_354.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_354.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_354.RULE
         matched_text: |
           I believe that most files in debian/ hardly contains any creative
@@ -329,30 +329,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 539
         end_line: 539
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 540
         end_line: 556
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 131
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1155.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1155.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1155.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -376,17 +376,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 565
         end_line: 567
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_3.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_3.RULE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -396,30 +396,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 569
         end_line: 569
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 570
         end_line: 585
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_196.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_196.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_196.RULE
         matched_text: |
           The nettle library is free software; you can redistribute it and/or modify
@@ -442,30 +442,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 587
         end_line: 587
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 588
         end_line: 605
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 140
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_857.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_857.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_857.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -490,17 +490,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 608
         end_line: 625
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -528,18 +528,18 @@ other_license_detections:
       AND LicenseRef-scancode-public-domain) AND LicenseRef-scancode-public-domain AND LGPL-2.0-or-later
       AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - 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
+          AND LicenseRef-scancode-public-domain
+        from_file:
         start_line: 10
         end_line: 16
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 79
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          AND LicenseRef-scancode-public-domain
-        rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_or_gpl-3.0-plus_and_other-permissive_and_public-domain_1.RULE
         matched_text: |
           Nettle is dual licenced under the GNU General Public License version
@@ -549,153 +549,153 @@ other_license_detections:
           licensed under more permissive terms, or in the public domain. To
           find the current status of particular files, you have to read the
           copyright notices at the top of the files.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 47
         end_line: 47
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 55
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_515.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_515.RULE
         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.
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 60
         end_line: 60
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_1090.RULE
         rule_relevance: 100
+        rule_identifier: mit_1090.RULE
         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.
-      - score: '100.0'
+      - license_expression: pycrypto
+        spdx_license_expression: LicenseRef-scancode-pycrypto
+        from_file:
         start_line: 64
         end_line: 65
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pycrypto
-        spdx_license_expression: LicenseRef-scancode-pycrypto
-        rule_identifier: pycrypto_1.RULE
         rule_relevance: 100
+        rule_identifier: pycrypto_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pycrypto_1.RULE
         matched_text: |
           Python Cryptography
               Toolkit license (essentially public domain).
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 69
         end_line: 69
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 74
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 81
         end_line: 82
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
         matched_text: |
           based on the code
               in libgcrypt, copyright owned by the Free Software Foundation.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 87
         end_line: 87
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 6
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_425.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_425.RULE
         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),
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 92
         end_line: 93
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_389.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_389.RULE
         matched_text: |
           based on the code in
               libgcrypt, copyright owned by the Free Software Foundation.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 105
         end_line: 105
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_15.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_15.RULE
         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.
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 106
         end_line: 106
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_465.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_465.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_465.RULE
         matched_text: released under the LGPL.
     identifier: gpl_2_0_plus_or_gpl_3_0_plus__and_other_permissive_and_public_domain__and_public_domain_and_lgpl_2_0_plus_and_mit_and_pycrypto_and_lgpl_2_1_plus-14e5a124-078d-9ad2-fd6e-8e31e8ec569e
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 76810a5d4d6..d1e29d4f106 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
@@ -41,17 +41,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 171
         end_line: '196'
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_591.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_591.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_591.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -84,17 +84,17 @@ license_detections:
   - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
     license_expression_spdx: GPL-2.0-or-later WITH Autoconf-exception-generic
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
+        from_file:
         start_line: '199'
         end_line: 218
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 165
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic
-        rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_16.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_autoconf-simple-exception-2.0_16.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-simple-exception-2.0_16.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -121,17 +121,17 @@ license_detections:
   - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
     license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus WITH libtool-exception-2.0
+        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
+        from_file:
         start_line: 221
         end_line: 240
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 171
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus WITH libtool-exception-2.0
-        spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception
-        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_17.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_with_libtool-exception-2.0_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_libtool-exception-2.0_17.RULE
         matched_text: |
           GNU Libtool is free software; you can redistribute it and/or modify
@@ -158,17 +158,17 @@ license_detections:
   - license_expression: gpl-3.0-plus WITH autoconf-simple-exception
     license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH autoconf-simple-exception
+        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
+        from_file:
         start_line: 243
         end_line: 264
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 186
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH autoconf-simple-exception
-        spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
-        rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_6.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_autoconf-simple-exception_6.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-simple-exception_6.RULE
         matched_text: |
           This file is free software; you can redistribute it and/or modify it
@@ -197,30 +197,30 @@ license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 266
         end_line: 266
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 267
         end_line: 280
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_369.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_369.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_369.RULE
         matched_text: |
           This library is free software: you can redistribute it and/or
@@ -241,30 +241,30 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 282
         end_line: 282
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 283
         end_line: 298
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 139
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_387.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_387.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_387.RULE
         matched_text: |
           The GNU C Library is free software; you can redistribute it and/or
@@ -287,17 +287,17 @@ license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 301
         end_line: 321
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -325,17 +325,17 @@ license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 324
         end_line: 326
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation gives
@@ -345,17 +345,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 329
         end_line: 336
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 63
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited-no-warranty.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -370,17 +370,17 @@ license_detections:
   - license_expression: fsf-free
     license_expression_spdx: FSFUL
     matches:
-      - score: '100.0'
+      - license_expression: fsf-free
+        spdx_license_expression: FSFUL
+        from_file:
         start_line: 339
         end_line: 340
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-free
-        spdx_license_expression: FSFUL
-        rule_identifier: fsf-free.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-free.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-free.LICENSE
         matched_text: |
           This configure script is free software; the Free Software Foundation
@@ -389,17 +389,17 @@ license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 343
         end_line: 346
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-ap.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -410,17 +410,17 @@ license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 349
         end_line: 356
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty_2.RULE
         matched_text: |
           This Makefile.in is free software; the Free Software Foundation
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 0d434836658..194c5135804 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
@@ -26,17 +26,17 @@ other_license_detections:
   - license_expression: fsf-unlimited-no-warranty
     license_expression_spdx: FSFULLRWD
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited-no-warranty
+        spdx_license_expression: FSFULLRWD
+        from_file:
         start_line: 17
         end_line: 24
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 64
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited-no-warranty
-        spdx_license_expression: FSFULLRWD
-        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited-no-warranty.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-unlimited-no-warranty.RULE
         matched_text: |
           This file is free software; as a special exception the author gives
@@ -51,17 +51,17 @@ other_license_detections:
   - license_expression: isc
     license_expression_spdx: ISC
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 61
         end_line: 71
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 110
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_20.RULE
         rule_relevance: 100
+        rule_identifier: isc_20.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_20.RULE
         matched_text: |
           Permission to use, copy, modify, and/or distribute this software for any
@@ -79,17 +79,17 @@ other_license_detections:
   - license_expression: isc AND ibm-dhcp
     license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp
     matches:
-      - score: '100.0'
+      - license_expression: isc
+        spdx_license_expression: ISC
+        from_file:
         start_line: 80
         end_line: 91
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 113
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: isc
-        spdx_license_expression: ISC
-        rule_identifier: isc_9.RULE
         rule_relevance: 100
+        rule_identifier: isc_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/isc_9.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software for any
@@ -104,17 +104,17 @@ other_license_detections:
           PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
           ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
           SOFTWARE.
-      - score: '100.0'
+      - license_expression: ibm-dhcp
+        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
+        from_file:
         start_line: 96
         end_line: 115
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 203
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ibm-dhcp
-        spdx_license_expression: LicenseRef-scancode-ibm-dhcp
-        rule_identifier: ibm-dhcp.LICENSE
         rule_relevance: 100
+        rule_identifier: ibm-dhcp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ibm-dhcp.LICENSE
         matched_text: |
           International Business Machines, Inc. (hereinafter called IBM) grants
@@ -141,34 +141,34 @@ other_license_detections:
   - license_expression: free-unknown
     license_expression_spdx: LicenseRef-scancode-free-unknown
     matches:
-      - score: '100.0'
+      - license_expression: free-unknown
+        spdx_license_expression: LicenseRef-scancode-free-unknown
+        from_file:
         start_line: 160
         end_line: 160
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: free-unknown
-        spdx_license_expression: LicenseRef-scancode-free-unknown
-        rule_identifier: free-unknown-package_4.RULE
         rule_relevance: 100
+        rule_identifier: free-unknown-package_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE
         matched_text: This file is distributed under the same license as the
     identifier: free_unknown-fddf748a-9953-bc6c-cb9d-91001840e335
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 165
         end_line: 187
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -198,17 +198,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '80.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 46
         end_line: 55
-        from_file:
+        matcher: 2-aho
+        score: '80.0'
         matched_length: 86
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit_17.RULE
         rule_relevance: 80
+        rule_identifier: mit_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_17.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
@@ -225,17 +225,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 151
         end_line: 152
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1043.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1043.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1043.RULE
         matched_text: |
           This file is distributed under the same license as the
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 2208293c64c..c5c5b32552a 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: (bsd-new OR lgpl-2.0-plus) AND gpl-1.0-plus
     license_expression_spdx: (BSD-3-Clause OR LGPL-2.0-or-later) AND GPL-1.0-or-later
     matches:
-      - score: '98.6'
+      - license_expression: bsd-new OR lgpl-2.0-plus
+        spdx_license_expression: BSD-3-Clause OR LGPL-2.0-or-later
+        from_file:
         start_line: 25
         end_line: 63
-        from_file:
+        matcher: 3-seq
+        score: '98.6'
         matched_length: 282
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: bsd-new OR lgpl-2.0-plus
-        spdx_license_expression: BSD-3-Clause OR LGPL-2.0-or-later
-        rule_identifier: bsd-new_or_lgpl-2.0-plus_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_or_lgpl-2.0-plus_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_or_lgpl-2.0-plus_4.RULE
         matched_text: |
           Unless otherwise *explicitly* stated the following text describes the
@@ -59,17 +59,17 @@ 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.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 66
         end_line: 67
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_10.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the GNU General
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 ce84ffe636d..4d9a5b4af84 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: pcre
     license_expression_spdx: LicenseRef-scancode-pcre
     matches:
-      - score: '100.0'
+      - license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
+        from_file:
         start_line: 3
         end_line: 5
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pcre
-        spdx_license_expression: LicenseRef-scancode-pcre
-        rule_identifier: pcre_7.RULE
         rule_relevance: 100
+        rule_identifier: pcre_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_7.RULE
         matched_text: |
           ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
@@ -28,60 +28,60 @@ license_detections:
   - license_expression: bsd-new AND public-domain
     license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 11
         end_line: 11
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_398.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_398.RULE
         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,
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 14
         end_line: 14
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_328.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_328.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_328.RULE
         matched_text: not copyrighted and is in the public domain.
     identifier: bsd_new_and_public_domain-e977518e-26ee-d19e-0b06-9fb80190cefe
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '99.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 58
         end_line: 58
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_898.RULE
         rule_relevance: 99
+        rule_identifier: bsd-new_898.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_898.RULE
         matched_text: THE "BSD" LICENCE
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 61
         end_line: 85
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1064.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1064.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1064.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 0dabfeb6d5d..d9d7c81a8a6 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
@@ -7,34 +7,34 @@ license_detections:
   - license_expression: pcre
     license_expression_spdx: LicenseRef-scancode-pcre
     matches:
-      - score: '100.0'
+      - license_expression: pcre
+        spdx_license_expression: LicenseRef-scancode-pcre
+        from_file:
         start_line: 7
         end_line: 7
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: pcre
-        spdx_license_expression: LicenseRef-scancode-pcre
-        rule_identifier: pcre_4.RULE
         rule_relevance: 100
+        rule_identifier: pcre_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pcre_4.RULE
         matched_text: PCRE LICENCE
     identifier: pcre-b7d0af79-af3f-24dc-6a31-2df791031f14
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 13
         end_line: 15
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_645.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_645.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_645.RULE
         matched_text: |
           PCRE is distributed under the terms of the "BSD" licence, as
@@ -44,17 +44,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 44
         end_line: 72
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 223
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1105.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1105.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1105.RULE
         matched_text: |
           THE "BSD" LICENCE
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 111e4f4f6d7..55897198182 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
@@ -15,30 +15,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 25
         end_line: 25
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 26
         end_line: 39
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 120
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_368.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_368.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_368.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
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 c2d8b534c30..7558a1fa6d2 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
@@ -8,17 +8,17 @@ license_detections:
   - license_expression: selinux-nsa-declaration-1.0
     license_expression_spdx: libselinux-1.0
     matches:
-      - score: '100.0'
+      - license_expression: selinux-nsa-declaration-1.0
+        spdx_license_expression: libselinux-1.0
+        from_file:
         start_line: 7
         end_line: 27
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 153
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: selinux-nsa-declaration-1.0
-        spdx_license_expression: libselinux-1.0
-        rule_identifier: selinux-nsa-declaration-1.0.LICENSE
         rule_relevance: 100
+        rule_identifier: selinux-nsa-declaration-1.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/selinux-nsa-declaration-1.0.LICENSE
         matched_text: |
           This library (libselinux) is public domain software, i.e. not copyrighted.
@@ -46,17 +46,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 32
         end_line: 33
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_929.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_929.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_929.RULE
         matched_text: |
           distributed underthe terms of the GNU General Public License,
@@ -65,17 +65,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 38
         end_line: 50
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 97
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_384.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_384.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_384.RULE
         matched_text: |
           The GNU C Library is distributed under
@@ -95,17 +95,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 56
         end_line: 65
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 78
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_930.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_930.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_930.RULE
         matched_text: |
           distributed under the terms of the GNU
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 ee5c4bd16ec..a59497d7e1b 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 7
         end_line: 22
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 140
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_385.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_385.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_385.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -40,17 +40,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 27
         end_line: 36
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 77
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1123.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1123.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1123.RULE
         matched_text: |
           distributed under the terms of the GNU
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 e94e5e36dda..05bcf876453 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-2.0
     license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-only
     matches:
-      - score: '89.63'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 16
         end_line: 41
-        from_file:
+        matcher: 3-seq
+        score: '89.63'
         matched_length: 147
         match_coverage: '89.63'
-        matcher: 3-seq
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_312.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_312.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_312.RULE
         matched_text: |
           library is free software; you can redistribute it and/or
@@ -46,17 +46,17 @@ license_detections:
 
           On Debian GNU/Linux systems, the complete text of the GNU General
           Public License can be found in `/usr/share/common-licenses/
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 36
         end_line: 46
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 77
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1123.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1123.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1123.RULE
         matched_text: |
           distributed under the terms of the GNU
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 9b432b2a096..820a1963ad7 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: mit-old-style-no-advert
     license_expression_spdx: NTP
     matches:
-      - score: '100.0'
+      - license_expression: mit-old-style-no-advert
+        spdx_license_expression: NTP
+        from_file:
         start_line: 15
         end_line: 25
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 112
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: mit-old-style-no-advert
-        spdx_license_expression: NTP
-        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_relevance: 100
+        rule_identifier: mit-old-style-no-advert_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style-no-advert_5.RULE
         matched_text: |
           Permission to use, copy, modify, and distribute this software
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 b9643c01681..38b2fab7875 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: openssl-ssleay
     license_expression_spdx: OpenSSL
     matches:
-      - score: '99.89'
+      - license_expression: openssl-ssleay
+        spdx_license_expression: OpenSSL
+        from_file:
         start_line: 10
         end_line: 133
-        from_file:
+        matcher: 3-seq
+        score: '99.89'
         matched_length: 869
         match_coverage: '99.89'
-        matcher: 3-seq
-        license_expression: openssl-ssleay
-        spdx_license_expression: OpenSSL
-        rule_identifier: openssl-ssleay_37.RULE
         rule_relevance: 100
+        rule_identifier: openssl-ssleay_37.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_37.RULE
         matched_text: "LICENSE ISSUES\n  ==============\n\n  The OpenSSL toolkit stays under\
           \ a dual license, i.e. both the conditions of\n  the OpenSSL License and the original\
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 4c1223a5010..8facace8821 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
@@ -29,17 +29,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 77
         end_line: 78
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
         matched_text: |
           You can use this free for any purpose. It's in the public domain. It has no
@@ -48,17 +48,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 150
         end_line: 166
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -82,30 +82,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 168
         end_line: 168
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 169
         end_line: 184
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1292.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -128,17 +128,17 @@ other_license_detections:
   - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
     license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
+        from_file:
         start_line: 187
         end_line: 215
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 242
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
-        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
-        rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         matched_text: |
           NOTE! This copyright does *not* cover user programs that use kernel services
@@ -174,30 +174,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 217
         end_line: 217
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 218
         end_line: 233
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -220,30 +220,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 235
         end_line: 235
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 236
         end_line: 251
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -266,30 +266,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 253
         end_line: 253
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 254
         end_line: 262
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all copyright
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 c0c25d29ae9..8ab12a267ff 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus AND gpl-3.0-plus
     license_expression_spdx: LGPL-2.1-or-later AND GPL-3.0-or-later
     matches:
-      - score: '95.45'
+      - 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
+        from_file:
         start_line: 14
         end_line: 15
-        from_file:
+        matcher: 2-aho
+        score: '95.45'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_and_gpl-3.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_and_gpl-3.0-plus_2.RULE
         matched_text: |
           The library itself is licensed as LGPLv2.1+, the build system, test-suite and
@@ -28,17 +28,17 @@ license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '99.39'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 23
         end_line: 42
-        from_file:
+        matcher: 2-aho
+        score: '99.39'
         matched_length: 164
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_312.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_312.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_312.RULE
         matched_text: |
           The LIBTASN1 library is free software; you can redistribute it
@@ -65,17 +65,17 @@ license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.3 AND gfdl-1.3-plus
     license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-only AND GFDL-1.3-or-later
     matches:
-      - score: '85.91'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 50
         end_line: 70
-        from_file:
+        matcher: 3-seq
+        score: '85.91'
         matched_length: 128
         match_coverage: '85.91'
-        matcher: 3-seq
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_417.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_417.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_417.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -99,32 +99,32 @@ license_detections:
 
           The documentation is distributed under the terms of the GNU Free
           Documentation License (
-      - score: '100.0'
+      - license_expression: gfdl-1.3
+        spdx_license_expression: GFDL-1.3-only
+        from_file:
         start_line: 69
         end_line: 70
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3
-        spdx_license_expression: GFDL-1.3-only
-        rule_identifier: gfdl-1.3_8.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3_8.RULE
         matched_text: |
           The documentation is distributed under the terms of the GNU Free
           Documentation License (FDL 1.3):
-      - score: '100.0'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: 74
         end_line: 83
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_25.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_25.RULE
         matched_text: |
           Permission is granted to copy, distribute and/or modify this
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 d262d88bc71..c8951da13e4 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
@@ -14,17 +14,17 @@ other_license_detections:
   - license_expression: x11-fsf
     license_expression_spdx: X11-distribute-modifications-variant
     matches:
-      - score: '100.0'
+      - license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
+        from_file:
         start_line: 22
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-fsf
-        spdx_license_expression: X11-distribute-modifications-variant
-        rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-fsf.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -54,17 +54,17 @@ other_license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 47
         end_line: 67
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -92,17 +92,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 70
         end_line: 92
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 bf7a91b8708..3342cccc69b 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
@@ -61,34 +61,34 @@ other_license_detections:
   - license_expression: other-permissive AND free-unknown
     license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown
     matches:
-      - score: '20.0'
+      - license_expression: other-permissive AND free-unknown
+        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown
+        from_file:
         start_line: 105
         end_line: 105
-        from_file:
+        matcher: 1-hash
+        score: '20.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-permissive AND free-unknown
-        spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown
-        rule_identifier: other-permissive_and_free-unknown_2.RULE
         rule_relevance: 20
+        rule_identifier: other-permissive_and_free-unknown_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_and_free-unknown_2.RULE
         matched_text: Autogenerated files with permissive licenses.
     identifier: other_permissive_and_free_unknown-27992f80-dbd8-9f3b-dff9-6668e7755e87
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 164
         end_line: 167
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap_4.RULE
         rule_relevance: 100
+        rule_identifier: fsf-ap_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_4.RULE
         matched_text: |
           Copying and distribution of this file, with or without modification,
@@ -99,17 +99,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 268
         end_line: 289
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_232.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_232.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_232.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -138,17 +138,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 292
         end_line: 311
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_27.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_27.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -175,17 +175,17 @@ other_license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 314
         end_line: 339
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 238
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_73.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_73.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_73.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -218,30 +218,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 341
         end_line: 341
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 342
         end_line: 348
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 75
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_386.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_386.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_386.RULE
         matched_text: |
           This file is distributed under the terms of the GNU Lesser General
@@ -255,30 +255,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 4c1223a5010..8facace8821 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
@@ -29,17 +29,17 @@ other_license_detections:
   - license_expression: public-domain-disclaimer
     license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: public-domain-disclaimer
+        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 77
         end_line: 78
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain-disclaimer
-        spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: public-domain-disclaimer_7.RULE
         rule_relevance: 100
+        rule_identifier: public-domain-disclaimer_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain-disclaimer_7.RULE
         matched_text: |
           You can use this free for any purpose. It's in the public domain. It has no
@@ -48,17 +48,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 150
         end_line: 166
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -82,30 +82,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 168
         end_line: 168
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 169
         end_line: 184
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1292.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1292.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1292.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -128,17 +128,17 @@ other_license_detections:
   - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
     license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
+        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
+        from_file:
         start_line: 187
         end_line: 215
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 242
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0 WITH linux-syscall-exception-gpl
-        spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note
-        rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_with_linux-syscall-exception-gpl_9.RULE
         matched_text: |
           NOTE! This copyright does *not* cover user programs that use kernel services
@@ -174,30 +174,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 217
         end_line: 217
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 218
         end_line: 233
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 134
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_737.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_737.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_737.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -220,30 +220,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 235
         end_line: 235
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 236
         end_line: 251
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -266,30 +266,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 253
         end_line: 253
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 254
         end_line: 262
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 82
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_153.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_153.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_153.RULE
         matched_text: |
           To the extent possible under law, the author(s) have dedicated all copyright
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 e8b61149e74..b18f48e0916 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
@@ -30,17 +30,17 @@ other_license_detections:
   - license_expression: fsf-unlimited
     license_expression_spdx: FSFULLR
     matches:
-      - score: '100.0'
+      - license_expression: fsf-unlimited
+        spdx_license_expression: FSFULLR
+        from_file:
         start_line: 13
         end_line: 15
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-unlimited
-        spdx_license_expression: FSFULLR
-        rule_identifier: fsf-unlimited.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-unlimited.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-unlimited.LICENSE
         matched_text: |
           This file is free software; the Free Software Foundation
@@ -50,17 +50,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0
     license_expression_spdx: GPL-1.0-or-later WITH Autoconf-exception-generic
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0
+        spdx_license_expression: GPL-1.0-or-later WITH Autoconf-exception-generic
+        from_file:
         start_line: 21
         end_line: 25
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 50
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0
-        spdx_license_expression: GPL-1.0-or-later WITH Autoconf-exception-generic
-        rule_identifier: gpl-1.0-plus_with_autoconf-simple-exception-2.0_2.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_with_autoconf-simple-exception-2.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_with_autoconf-simple-exception-2.0_2.RULE
         matched_text: |
           This file is free software, distributed under the terms of the GNU
@@ -72,30 +72,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 54
         end_line: 54
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 55
         end_line: 70
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_244.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_244.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_244.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify it
@@ -118,30 +118,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 72
         end_line: 72
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 73
         end_line: 88
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 128
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_484.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_484.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_484.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -164,30 +164,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 90
         end_line: 90
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 91
         end_line: 108
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 136
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_990.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_990.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_990.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -212,30 +212,30 @@ other_license_detections:
   - license_expression: gfdl-1.2-plus
     license_expression_spdx: GFDL-1.2-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
+        from_file:
         start_line: 110
         end_line: 110
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gfdl-1.2-plus
-        spdx_license_expression: GFDL-1.2-or-later
-        rule_identifier: debian_common_gfdl-1.2-plus.RULE
         rule_relevance: 100
+        rule_identifier: debian_common_gfdl-1.2-plus.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gfdl-1.2-plus
+        spdx_license_expression: GFDL-1.2-or-later
+        from_file:
         start_line: 111
         end_line: 120
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 93
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gfdl-1.2-plus
-        spdx_license_expression: GFDL-1.2-or-later
-        rule_identifier: gfdl-1.2-plus_21.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.2-plus_21.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.2-plus_21.RULE
         matched_text: |
           This manual is covered by the GNU FDL.  Permission is granted to
@@ -252,17 +252,17 @@ other_license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 123
         end_line: 143
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 a28d0c82a05..6f3b870c079 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
@@ -14,17 +14,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 20
         end_line: 39
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 183
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without modification,
@@ -51,30 +51,30 @@ other_license_detections:
   - license_expression: gpl-2.0 AND gpl-2.0-plus
     license_expression_spdx: GPL-2.0-only AND GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 41
         end_line: 41
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 42
         end_line: 57
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 129
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_984.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_984.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_984.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 d2cb4cd7b3c..ed7883a2673 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
@@ -20,17 +20,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 30
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_81.RULE
         rule_relevance: 100
+        rule_identifier: zlib_81.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_81.RULE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -52,17 +52,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 59
         end_line: 77
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining
@@ -88,30 +88,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 79
         end_line: 79
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 80
         end_line: 94
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -133,17 +133,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 97
         end_line: 117
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1273.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1273.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1273.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 0744fec881d..794e862a8c6 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '97.18'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 20
         end_line: 42
-        from_file:
+        matcher: 3-seq
+        score: '97.18'
         matched_length: 207
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_67.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_67.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_67.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -47,17 +47,17 @@ license_detections:
   - license_expression: tcp-wrappers
     license_expression_spdx: TCP-wrappers
     matches:
-      - score: '100.0'
+      - license_expression: tcp-wrappers
+        spdx_license_expression: TCP-wrappers
+        from_file:
         start_line: 72
         end_line: 85
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: tcp-wrappers
-        spdx_license_expression: TCP-wrappers
-        rule_identifier: tcp-wrappers_3.RULE
         rule_relevance: 100
+        rule_identifier: tcp-wrappers_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcp-wrappers_3.RULE
         matched_text: "Individual files\n* may be covered by other copyrights (as noted in the\
           \ file itself.)\n*\n* This material was originally written and compiled by Wietse\
@@ -71,17 +71,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 92
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 100
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_749.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_749.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_749.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 dd8da3c19f6..6517e12a768 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
@@ -9,17 +9,17 @@ license_detections:
   - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert
     license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP
     matches:
-      - score: '99.02'
+      - 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
+        from_file:
         start_line: 17
         end_line: 30
-        from_file:
+        matcher: 3-seq
+        score: '99.02'
         matched_length: 101
         match_coverage: '99.02'
-        matcher: 3-seq
-        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
-        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_lgpl-2.0_and_bsd-new_and_mit_1.RULE
         matched_text: "This package, the EXT2 filesystem utilities, are made available under\n\
           the GNU General Public License version 2, with the exception of the\nlib/ext2fs and\
@@ -34,17 +34,17 @@ license_detections:
   - license_expression: ntp-0 AND bsd-new
     license_expression_spdx: NTP-0 AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: ntp-0
+        spdx_license_expression: NTP-0
+        from_file:
         start_line: 38
         end_line: 45
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 85
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: ntp-0
-        spdx_license_expression: NTP-0
-        rule_identifier: ntp-0.LICENSE
         rule_relevance: 100
+        rule_identifier: ntp-0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ntp-0.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this software and
@@ -55,17 +55,17 @@ license_detections:
              M.I.T. S.I.P.B. make no representations about the suitability of
              this software for any purpose.  It is provided "as is" without
              express or implied warranty.
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 49
         end_line: 73
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 210
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_117.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_117.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_117.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 59966837990..5de46cb8e8b 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
@@ -13,17 +13,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 15
         end_line: 37
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1069.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1069.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1069.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -53,30 +53,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 39
         end_line: 39
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 40
         end_line: 58
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 131
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1301.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1301.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1301.RULE
         matched_text: |
           This program is free software; you can redistribute it
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 3aa3c3ee899..ec5f03ae9c2 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '99.18'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: '19'
         end_line: 32
-        from_file:
+        matcher: 2-aho
+        score: '99.18'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1030.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1030.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1030.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 d262d88bc71..c8951da13e4 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
@@ -14,17 +14,17 @@ other_license_detections:
   - license_expression: x11-fsf
     license_expression_spdx: X11-distribute-modifications-variant
     matches:
-      - score: '100.0'
+      - license_expression: x11-fsf
+        spdx_license_expression: X11-distribute-modifications-variant
+        from_file:
         start_line: 22
         end_line: 44
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 200
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-fsf
-        spdx_license_expression: X11-distribute-modifications-variant
-        rule_identifier: x11-fsf.LICENSE
         rule_relevance: 100
+        rule_identifier: x11-fsf.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
@@ -54,17 +54,17 @@ other_license_detections:
   - license_expression: x11-xconsortium
     license_expression_spdx: X11
     matches:
-      - score: '100.0'
+      - license_expression: x11-xconsortium
+        spdx_license_expression: X11
+        from_file:
         start_line: 47
         end_line: 67
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 201
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: x11-xconsortium
-        spdx_license_expression: X11
-        rule_identifier: x11-xconsortium_2.RULE
         rule_relevance: 100
+        rule_identifier: x11-xconsortium_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -92,17 +92,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 70
         end_line: 92
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
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 0744fec881d..794e862a8c6 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '97.18'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 20
         end_line: 42
-        from_file:
+        matcher: 3-seq
+        score: '97.18'
         matched_length: 207
         match_coverage: '100.0'
-        matcher: 3-seq
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_67.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_67.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_67.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -47,17 +47,17 @@ license_detections:
   - license_expression: tcp-wrappers
     license_expression_spdx: TCP-wrappers
     matches:
-      - score: '100.0'
+      - license_expression: tcp-wrappers
+        spdx_license_expression: TCP-wrappers
+        from_file:
         start_line: 72
         end_line: 85
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: tcp-wrappers
-        spdx_license_expression: TCP-wrappers
-        rule_identifier: tcp-wrappers_3.RULE
         rule_relevance: 100
+        rule_identifier: tcp-wrappers_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcp-wrappers_3.RULE
         matched_text: "Individual files\n* may be covered by other copyrights (as noted in the\
           \ file itself.)\n*\n* This material was originally written and compiled by Wietse\
@@ -71,17 +71,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 92
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 100
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_749.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_749.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_749.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
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 49d91a2eb50..26870fc373f 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
@@ -703,30 +703,30 @@ other_license_detections:
   - license_expression: lgpl-2.1
     license_expression_spdx: LGPL-2.1-only
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 2025
         end_line: 2025
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_38.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_38.RULE
         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'
-      - score: '100.0'
+      - license_expression: lgpl-2.1
+        spdx_license_expression: LGPL-2.1-only
+        from_file:
         start_line: 2026
         end_line: 2027
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 25
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1
-        spdx_license_expression: LGPL-2.1-only
-        rule_identifier: lgpl-2.1_249.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1_249.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_249.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the LGPL 2.1
@@ -735,30 +735,30 @@ other_license_detections:
   - license_expression: gpl-1.0-plus AND gpl-1.0
     license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus
+        spdx_license_expression: GPL-1.0-or-later
+        from_file:
         start_line: 2029
         end_line: 2029
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus
-        spdx_license_expression: GPL-1.0-or-later
-        rule_identifier: gpl-1.0-plus_395.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_395.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-1.0
+        spdx_license_expression: GPL-1.0-only
+        from_file:
         start_line: 2030
         end_line: 2031
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0
-        spdx_license_expression: GPL-1.0-only
-        rule_identifier: gpl-1.0_38.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_38.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the GNU General
@@ -767,30 +767,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus AND gpl-2.0
     license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 2033
         end_line: 2033
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 2034
         end_line: 2036
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1040.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1040.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1040.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of version 2 of
@@ -800,30 +800,30 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 2038
         end_line: 2038
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_26.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE
         matched_text: 'License: artistic'
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 2039
         end_line: 2040
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_2.RULE
         matched_text: |
           On Debian GNU/Linux systems, the complete text of the
@@ -832,17 +832,17 @@ other_license_detections:
   - license_expression: artistic-2.0
     license_expression_spdx: Artistic-2.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
+        from_file:
         start_line: 2043
         end_line: 2224
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 1354
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0
-        spdx_license_expression: Artistic-2.0
-        rule_identifier: artistic-2.0_36.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_36.RULE
         matched_text: |
           Copyright (c) 2000-2006, The Perl Foundation.
@@ -1031,17 +1031,17 @@ other_license_detections:
   - license_expression: bzip2-libbzip-2010
     license_expression_spdx: bzip2-1.0.6
     matches:
-      - score: '100.0'
+      - license_expression: bzip2-libbzip-2010
+        spdx_license_expression: bzip2-1.0.6
+        from_file:
         start_line: 2227
         end_line: 2256
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 233
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bzip2-libbzip-2010
-        spdx_license_expression: bzip2-1.0.6
-        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_relevance: 100
+        rule_identifier: bzip2-libbzip-2010.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1078,17 +1078,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 2262
         end_line: 2276
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 132
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib.LICENSE
         rule_relevance: 100
+        rule_identifier: zlib.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE
         matched_text: |
           This software is provided 'as-is', without any express or implied
@@ -1110,17 +1110,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 2279
         end_line: 2295
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1144,17 +1144,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2298
         end_line: 2320
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_42.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_42.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1184,17 +1184,17 @@ other_license_detections:
   - license_expression: bsd-original
     license_expression_spdx: BSD-4-Clause
     matches:
-      - score: '98.25'
+      - license_expression: bsd-original
+        spdx_license_expression: BSD-4-Clause
+        from_file:
         start_line: 2323
         end_line: 2349
-        from_file:
+        matcher: 1-hash
+        score: '98.25'
         matched_length: 224
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original
-        spdx_license_expression: BSD-4-Clause
-        rule_identifier: bsd-original_80.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original_80.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_80.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1228,17 +1228,17 @@ other_license_detections:
   - license_expression: unicode-dfs-2015
     license_expression_spdx: Unicode-DFS-2015
     matches:
-      - score: '99.57'
+      - license_expression: unicode-dfs-2015
+        spdx_license_expression: Unicode-DFS-2015
+        from_file:
         start_line: 2353
         end_line: 2407
-        from_file:
+        matcher: 3-seq
+        score: '99.57'
         matched_length: 468
         match_coverage: '99.57'
-        matcher: 3-seq
-        license_expression: unicode-dfs-2015
-        spdx_license_expression: Unicode-DFS-2015
-        rule_identifier: unicode-dfs-2015_9.RULE
         rule_relevance: 100
+        rule_identifier: unicode-dfs-2015_9.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode-dfs-2015_9.RULE
         matched_text: |
           UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
@@ -1300,17 +1300,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2410
         end_line: 2432
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 207
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_313.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_313.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_313.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1340,17 +1340,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 2435
         end_line: 2457
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_19.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_19.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1380,17 +1380,17 @@ other_license_detections:
   - license_expression: regexp
     license_expression_spdx: Spencer-86
     matches:
-      - score: '100.0'
+      - license_expression: regexp
+        spdx_license_expression: Spencer-86
+        from_file:
         start_line: 2460
         end_line: 2472
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 88
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: regexp
-        spdx_license_expression: Spencer-86
-        rule_identifier: regexp.LICENSE
         rule_relevance: 100
+        rule_identifier: regexp.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/regexp.LICENSE
         matched_text: |
           Permission is granted to anyone to use this software for any
@@ -1410,17 +1410,17 @@ other_license_detections:
   - license_expression: ttwl
     license_expression_spdx: TTWL
     matches:
-      - score: '100.0'
+      - license_expression: ttwl
+        spdx_license_expression: TTWL
+        from_file:
         start_line: 2475
         end_line: 2479
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 43
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: ttwl
-        spdx_license_expression: TTWL
-        rule_identifier: ttwl.LICENSE
         rule_relevance: 100
+        rule_identifier: ttwl.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ttwl.LICENSE
         matched_text: |
           This module may be modified, used, copied, and redistributed at your own risk.
@@ -1432,17 +1432,17 @@ other_license_detections:
   - license_expression: other-copyleft
     license_expression_spdx: LicenseRef-scancode-other-copyleft
     matches:
-      - score: '90.0'
+      - license_expression: other-copyleft
+        spdx_license_expression: LicenseRef-scancode-other-copyleft
+        from_file:
         start_line: 2482
         end_line: 2483
-        from_file:
+        matcher: 1-hash
+        score: '90.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: other-copyleft
-        spdx_license_expression: LicenseRef-scancode-other-copyleft
-        rule_identifier: other-copyleft_4.RULE
         rule_relevance: 90
+        rule_identifier: other-copyleft_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_4.RULE
         matched_text: |
           Everyone is permitted to copy and distribute verbatim copies
@@ -1451,73 +1451,73 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2489
         end_line: 2489
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_45.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_45.RULE
         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.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2494
         end_line: 2494
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 5
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_285.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_285.RULE
         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,
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2495
         end_line: 2495
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public-domain
-      - score: '70.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 2504
         end_line: 2504
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_bare_words.RULE
         rule_relevance: 70
+        rule_identifier: public-domain_bare_words.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public  domain
     identifier: public_domain-d6560563-b3c0-65ee-7cca-7225d652d54d
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2
     license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus WITH bison-exception-2.2
+        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
+        from_file:
         start_line: 2508
         end_line: 2532
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus WITH bison-exception-2.2
-        spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2
-        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_bison-exception-3.0_1.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -1549,17 +1549,17 @@ other_license_detections:
   - license_expression: paul-hsieh-derivative
     license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative
     matches:
-      - score: '100.0'
+      - license_expression: paul-hsieh-derivative
+        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
+        from_file:
         start_line: 2535
         end_line: 2550
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 121
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: paul-hsieh-derivative
-        spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative
-        rule_identifier: paul-hsieh-derivative_1.RULE
         rule_relevance: 100
+        rule_identifier: paul-hsieh-derivative_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/paul-hsieh-derivative_1.RULE
         matched_text: |
           The derivative content includes raw computer source code, ideas,
@@ -1582,17 +1582,17 @@ other_license_detections:
   - license_expression: bsd-x11
     license_expression_spdx: LicenseRef-scancode-bsd-x11
     matches:
-      - score: '99.0'
+      - license_expression: bsd-x11
+        spdx_license_expression: LicenseRef-scancode-bsd-x11
+        from_file:
         start_line: 2556
         end_line: 2581
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-x11
-        spdx_license_expression: LicenseRef-scancode-bsd-x11
-        rule_identifier: bsd-x11_10.RULE
         rule_relevance: 99
+        rule_identifier: bsd-x11_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-x11_10.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -1625,30 +1625,30 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 2583
         end_line: 2583
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_12.RULE
         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'
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 2584
         end_line: 2703
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 981
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_155.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_155.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE
         matched_text: |
           Statatement of Purpose
@@ -1775,17 +1775,17 @@ other_license_detections:
   - license_expression: fsf-ap
     license_expression_spdx: FSFAP
     matches:
-      - score: '100.0'
+      - license_expression: fsf-ap
+        spdx_license_expression: FSFAP
+        from_file:
         start_line: 2710
         end_line: 2713
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: fsf-ap
-        spdx_license_expression: FSFAP
-        rule_identifier: fsf-ap.LICENSE
         rule_relevance: 100
+        rule_identifier: fsf-ap.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/fsf-ap.LICENSE
         matched_text: |
           Copying and distribution of this file, with or without modification, are
@@ -1796,17 +1796,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
+        from_file:
         start_line: 2716
         end_line: 2840
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 947
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-dist-1.0
-        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
-        rule_identifier: artistic-dist-1.0.LICENSE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/artistic-dist-1.0.LICENSE
         matched_text: |
           The "Artistic License"
@@ -1938,17 +1938,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 22
         end_line: 29
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 49
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -1963,85 +1963,85 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 49
         end_line: 49
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 56
         end_line: 56
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 64
         end_line: 64
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 74
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 105
         end_line: 106
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2050,17 +2050,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 118
         end_line: 119
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it
@@ -2069,34 +2069,34 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 147
         end_line: 147
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_14.RULE
         rule_relevance: 100
+        rule_identifier: unicode_14.RULE
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 157
         end_line: 159
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_26.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2106,17 +2106,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 167
         end_line: 168
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_47.RULE
         matched_text: |
           This module is free software; you can redistribute and/or modify
@@ -2125,17 +2125,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 175
         end_line: 176
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2144,68 +2144,68 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 183
         end_line: 183
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_34.RULE
         matched_text: All files are licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-4e05fce9-1807-80b2-856e-0fa39a440170
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '90.91'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: '190'
         end_line: '190'
-        from_file:
+        matcher: 1-hash
+        score: '90.91'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_32.RULE
         matched_text: The PerlUi class is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-522746e5-bffc-fa4c-ea81-334067779aac
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '91.67'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: '198'
         end_line: '198'
-        from_file:
+        matcher: 1-hash
+        score: '91.67'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_31.RULE
         matched_text: The Symbian port is licensed under the same terms as Perl itself.
     identifier: artistic_perl_1_0_or_gpl_1_0_plus-7e59d507-72c7-19bf-6165-d58bcc316f9a
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 208
         end_line: 209
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_28.RULE
         matched_text: |
           It is assumed that the test code is licensed under the same terms
@@ -2214,17 +2214,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 223
         end_line: 224
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2233,17 +2233,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 233
         end_line: 234
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it
@@ -2252,17 +2252,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 241
         end_line: 242
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2271,17 +2271,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 249
         end_line: 250
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under the same
@@ -2290,17 +2290,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 257
         end_line: 258
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2309,17 +2309,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 267
         end_line: 268
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -2328,34 +2328,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 275
         end_line: 275
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 10
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_12.RULE
         matched_text: This file is a part of Perl itself, licensed as above.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-fd15e46d-ac77-acdb-3f93-0d54ee03a1b7
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 309
         end_line: 310
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_52.RULE
         matched_text: |
           There is no copyright or license information in these distributions.
@@ -2364,17 +2364,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 316
         end_line: 317
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         matched_text: |
           This library is free software; you may redistribute and/or modify
@@ -2383,34 +2383,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 330
         end_line: 330
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 336
         end_line: 337
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         matched_text: |
           This module is free software, you may distribute it under the
@@ -2419,17 +2419,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 345
         end_line: 347
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 31
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_43.RULE
         matched_text: |
           This is free software.  You may modify and/or redistribute this
@@ -2439,17 +2439,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 355
         end_line: 356
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 16
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_44.RULE
         matched_text: |
           This module is free software.  You may distribute it under the
@@ -2458,17 +2458,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 362
         end_line: 363
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -2477,17 +2477,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 382
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -2496,17 +2496,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 395
         end_line: 396
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2515,17 +2515,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 402
         end_line: 403
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2534,34 +2534,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 411
         end_line: 411
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_42.RULE
         matched_text: You may redistribute this under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-d15d44f1-6970-d898-4fa2-eb72ec024222
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 419
         end_line: 420
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2570,17 +2570,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 431
         end_line: 432
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2589,17 +2589,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 439
         end_line: 440
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2608,17 +2608,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 447
         end_line: 448
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2627,17 +2627,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 454
         end_line: 455
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -2646,17 +2646,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 465
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2665,17 +2665,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 475
         end_line: 476
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -2684,17 +2684,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 484
         end_line: 485
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -2703,17 +2703,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 494
         end_line: 495
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -2722,17 +2722,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 502
         end_line: 503
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2741,17 +2741,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 509
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2760,17 +2760,17 @@ other_license_detections:
   - license_expression: artistic-2.0
     license_expression_spdx: Artistic-2.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0
+        spdx_license_expression: Artistic-2.0
+        from_file:
         start_line: 516
         end_line: 517
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0
-        spdx_license_expression: Artistic-2.0
-        rule_identifier: artistic-2.0_38.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_38.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2779,17 +2779,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 524
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -2798,17 +2798,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 531
         end_line: 532
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software. You can redistribute it
@@ -2817,17 +2817,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
+        from_file:
         start_line: 539
         end_line: 545
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 61
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-2.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_2.RULE
         matched_text: |
           This library is free software; you may redistribute it and/or modify
@@ -2841,17 +2841,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 553
         end_line: 554
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2860,17 +2860,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 561
         end_line: 570
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 71
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_41.RULE
         matched_text: |
           There are no copyright or license notices in this distribution. It
@@ -2887,17 +2887,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 578
         end_line: 579
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -2906,17 +2906,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 585
         end_line: 586
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_15.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it
@@ -2925,17 +2925,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 600
         end_line: 601
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_25.RULE
         matched_text: |
           This library is free software; you may redistribute and/or modify it
@@ -2944,17 +2944,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 609
         end_line: 610
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -2963,17 +2963,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 618
         end_line: 619
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -2982,17 +2982,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 628
         end_line: 629
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3001,17 +3001,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-2.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
+        from_file:
         start_line: 636
         end_line: 640
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 47
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-2.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-2.0-plus_3.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3023,17 +3023,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 647
         end_line: 648
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3042,17 +3042,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 655
         end_line: 656
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3061,17 +3061,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 663
         end_line: 664
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute
@@ -3080,17 +3080,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 673
         end_line: 674
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3099,17 +3099,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 681
         end_line: 682
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3118,17 +3118,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 690
         end_line: 691
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3137,17 +3137,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 698
         end_line: 699
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_15.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public License
@@ -3156,17 +3156,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 706
         end_line: 707
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3175,17 +3175,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 717
         end_line: 718
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3194,17 +3194,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 724
         end_line: 725
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3213,17 +3213,17 @@ other_license_detections:
   - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 732
         end_line: 734
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_relevance: 100
+        rule_identifier: mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-1.0-plus_or_artistic-perl-1.0_1.RULE
         matched_text: |
           This software is released under the MIT license cited below.  Additionally,
@@ -3233,17 +3233,17 @@ other_license_detections:
   - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '99.0'
+      - 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
+        from_file:
         start_line: 748
         end_line: 749
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        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
-        rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 99
+        rule_identifier: mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_artistic-perl-1.0_or_gpl-1.0-plus_1.RULE
         matched_text: |
           It is assumed that these translations are licensed under the same terms as
@@ -3252,17 +3252,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 755
         end_line: 756
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3271,17 +3271,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 763
         end_line: 767
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 34
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_8.RULE
         matched_text: |
           This library is free software; you may redistribute it and/or modify
@@ -3293,17 +3293,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 775
         end_line: 776
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3312,32 +3312,32 @@ other_license_detections:
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND metamail
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 784
         end_line: 785
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: metamail
+        spdx_license_expression: metamail
+        from_file:
         start_line: 792
         end_line: 801
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: metamail
-        spdx_license_expression: metamail
-        rule_identifier: metamail.LICENSE
         rule_relevance: 100
+        rule_identifier: metamail.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this material
@@ -3354,17 +3354,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 809
         end_line: 810
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -3373,17 +3373,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 817
         end_line: 818
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -3392,34 +3392,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 825
         end_line: 825
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_10.RULE
         matched_text: This module is released under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-6ac722a3-703c-e413-9b17-5dd475d88fa5
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 832
         end_line: 833
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3428,17 +3428,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 840
         end_line: 841
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -3447,17 +3447,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 848
         end_line: 850
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software;
@@ -3467,17 +3467,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 857
         end_line: 858
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -3486,17 +3486,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 866
         end_line: 867
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3505,17 +3505,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 875
         end_line: 876
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3524,17 +3524,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 919
         end_line: 920
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify it
@@ -3543,17 +3543,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 927
         end_line: 928
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -3562,17 +3562,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 935
         end_line: 936
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -3582,17 +3582,17 @@ other_license_detections:
     license_expression_spdx: Artistic-1.0-Perl AND LicenseRef-scancode-public-domain AND (Artistic-2.0
       AND LicenseRef-scancode-public-domain-disclaimer)
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 950
         end_line: 954
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 35
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_12.RULE
         matched_text: |
           The license notice in the document is:
@@ -3600,17 +3600,17 @@ other_license_detections:
            When included as an integrated part of the Standard Distribution
            of Perl or of its documentation (printed or otherwise), this works is
            covered under Perl's Artistic License.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 957
         end_line: 961
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_286.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_286.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
         matched_text: |
           Irrespective of its distribution, all code examples here are in the public
@@ -3618,17 +3618,17 @@ other_license_detections:
            derivatives thereof in your own programs for fun or for profit as you
            see fit.  A simple comment in the code giving credit to the FAQ would
            be courteous but is not required.
-      - score: '100.0'
+      - license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 965
         end_line: 967
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-2.0 AND public-domain-disclaimer
-        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
         matched_text: |
           This document is available under the same terms as Perl itself. Code
@@ -3638,17 +3638,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 975
         end_line: 977
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_5.RULE
         matched_text: |
           is free software;
@@ -3658,17 +3658,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 984
         end_line: 985
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3677,17 +3677,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 992
         end_line: 993
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3696,17 +3696,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1008
         end_line: 1009
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -3715,17 +3715,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1029
         end_line: 1030
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 18
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_40.RULE
         matched_text: |
           This software is free software and can be modified and distributed under
@@ -3734,17 +3734,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1037
         end_line: 1038
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -3753,17 +3753,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1045
         end_line: 1046
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3772,17 +3772,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1054
         end_line: 1055
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it
@@ -3791,17 +3791,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1063
         end_line: 1064
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3810,17 +3810,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1072
         end_line: 1073
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -3829,17 +3829,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1080
         end_line: 1081
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3848,17 +3848,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1096
         end_line: 1097
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3867,32 +3867,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1104
         end_line: 1105
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1107
         end_line: 1111
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_287.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_287.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
         matched_text: |
           Irrespective of its distribution, all code examples in these files
@@ -3904,17 +3904,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1119
         end_line: 1120
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3923,17 +3923,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1126
         end_line: 1127
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it
@@ -3942,17 +3942,17 @@ other_license_detections:
   - license_expression: cc0-1.0
     license_expression_spdx: CC0-1.0
     matches:
-      - score: '100.0'
+      - license_expression: cc0-1.0
+        spdx_license_expression: CC0-1.0
+        from_file:
         start_line: 1138
         end_line: 1140
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: cc0-1.0
-        spdx_license_expression: CC0-1.0
-        rule_identifier: cc0-1.0_154.RULE
         rule_relevance: 100
+        rule_identifier: cc0-1.0_154.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_154.RULE
         matched_text: |
           The file links to http://creativecommons.org/publicdomain/zero/1.0/
@@ -3962,17 +3962,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1148
         end_line: 1149
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed and/or
@@ -3981,17 +3981,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1156
         end_line: 1159
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_relevance: 99
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_38.RULE
         matched_text: |
           There are no copyright notices this distribution.
@@ -4002,17 +4002,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1180
         end_line: 1184
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 33
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_37.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -4024,17 +4024,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 1191
         end_line: 1192
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -4043,17 +4043,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1198
         end_line: 1199
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_35.RULE
         matched_text: |
           This module is free software, you may distribute it under the same
@@ -4062,30 +4062,30 @@ other_license_detections:
   - license_expression: bsd-new AND (gpl-1.0-plus OR artistic-perl-1.0)
     license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl)
     matches:
-      - score: '99.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 1208
         end_line: 1208
-        from_file:
+        matcher: 2-aho
+        score: '99.0'
         matched_length: 7
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1065.RULE
         rule_relevance: 99
+        rule_identifier: bsd-new_1065.RULE
         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
-      - score: '70.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1209
         end_line: 1210
-        from_file:
+        matcher: 2-aho
+        score: '70.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_relevance: 70
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_34.RULE
         matched_text: |
           It is assumed that the other parts are licensed under the same
@@ -4094,17 +4094,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1218
         end_line: 1219
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -4113,34 +4113,34 @@ other_license_detections:
   - license_expression: unicode
     license_expression_spdx: LicenseRef-scancode-unicode
     matches:
-      - score: '100.0'
+      - license_expression: unicode
+        spdx_license_expression: LicenseRef-scancode-unicode
+        from_file:
         start_line: 1226
         end_line: 1226
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 13
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: unicode
-        spdx_license_expression: LicenseRef-scancode-unicode
-        rule_identifier: unicode_14.RULE
         rule_relevance: 100
+        rule_identifier: unicode_14.RULE
         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
     identifier: unicode-694376d5-aeeb-e4bc-a4e1-095d162d3862
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1236
         end_line: 1237
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or
@@ -4149,17 +4149,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1248
         end_line: 1252
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_32.RULE
         matched_text: |
           This module is free software; you may redistribute it and/or modify it
@@ -4171,17 +4171,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1262
         end_line: 1263
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4190,17 +4190,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1271
         end_line: 1272
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4209,17 +4209,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1279
         end_line: 1280
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -4228,17 +4228,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1288
         end_line: 1289
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -4248,32 +4248,32 @@ other_license_detections:
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND (GPL-1.0-or-later OR
       Artistic-1.0-Perl)
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1297
         end_line: 1298
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1300
         end_line: 1301
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_31.RULE
         matched_text: |
           Perl 5
@@ -4282,17 +4282,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1308
         end_line: 1309
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_3.RULE
         matched_text: |
           This module is free software. It may be used, redistributed
@@ -4301,17 +4301,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
+        from_file:
         start_line: 1315
         end_line: 1316
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 24
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0
-        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_3.RULE
         matched_text: |
           This is free software; you can redistribute it and/or modify it under
@@ -4320,17 +4320,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1324
         end_line: 1325
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -4339,17 +4339,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1332
         end_line: 1333
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_48.RULE
         matched_text: |
           You can redistribute and/or modify this document under the same terms
@@ -4358,17 +4358,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1340
         end_line: 1341
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -4377,32 +4377,32 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1349
         end_line: 1350
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
           modify it under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1353
         end_line: 1355
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 27
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_46.RULE
         matched_text: |
           This module is distributed under the same terms as Perl itself.
@@ -4412,34 +4412,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1361
         end_line: 1361
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_11.RULE
         matched_text: This package has the same copyright and license as the perl core.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-00c5b5e7-0cc5-6dc8-2914-7a86e3fe305f
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1368
         end_line: 1369
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4448,34 +4448,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1375
         end_line: 1375
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1382
         end_line: 1383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or modify
@@ -4484,34 +4484,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1390
         end_line: 1390
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_29.RULE
         matched_text: This program is distributed under the same terms as perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-2bcbbce8-54f0-bccc-2196-d6690e456d84
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1397
         end_line: 1398
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_24.RULE
         matched_text: |
           This module is free software; you can redistribute it and/or modify it
@@ -4520,17 +4520,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1409
         end_line: 1410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_4.RULE
         matched_text: |
           This program is free software; you may redistribute it and/or
@@ -4539,17 +4539,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1417
         end_line: 1418
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4558,17 +4558,17 @@ other_license_detections:
   - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new
     license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: 1427
         end_line: 1433
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_and_bsd-new_2.RULE
         matched_text: |
           The main license applies to most of the code:
@@ -4582,17 +4582,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1456
         end_line: 1457
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify it
@@ -4601,17 +4601,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1467
         end_line: 1468
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_45.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4620,17 +4620,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1476
         end_line: 1477
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4639,17 +4639,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1487
         end_line: 1488
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4658,17 +4658,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1497
         end_line: 1498
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_30.RULE
         matched_text: |
           You may redistribute only under the same terms as Perl 5, as specified
@@ -4677,17 +4677,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1517
         end_line: 1518
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4696,17 +4696,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1527
         end_line: 1529
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 30
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_44.RULE
         matched_text: |
           This package is free software and is provided "as is" without express
@@ -4716,17 +4716,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1539
         end_line: 1540
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4735,17 +4735,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1547
         end_line: 1548
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4754,17 +4754,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1556
         end_line: 1557
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4773,17 +4773,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1566
         end_line: 1567
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_42.RULE
         matched_text: |
           There is no license information included. It is assumed that this
@@ -4792,17 +4792,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1574
         end_line: 1575
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4811,17 +4811,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1582
         end_line: 1583
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_49.RULE
         matched_text: |
           This program is free software; you can redistribute and/or modify it
@@ -4830,17 +4830,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1590
         end_line: 1591
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -4849,17 +4849,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1598
         end_line: 1600
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 29
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_41.RULE
         matched_text: |
           There is no license information included that clearly applies to the
@@ -4869,17 +4869,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1609
         end_line: 1609
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 15
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_40.RULE
         matched_text: It is assumed that this file is licensed under the same terms as Perl
           itself.
@@ -4887,17 +4887,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1616
         end_line: 1617
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -4906,17 +4906,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1624
         end_line: 1626
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 11
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_25.RULE
         matched_text: |
           The license in the file is specified as
@@ -4926,17 +4926,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1633
         end_line: 1634
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -4945,34 +4945,34 @@ other_license_detections:
   - license_expression: artistic-1.0
     license_expression_spdx: Artistic-1.0
     matches:
-      - score: '90.0'
+      - license_expression: artistic-1.0
+        spdx_license_expression: Artistic-1.0
+        from_file:
         start_line: 1641
         end_line: 1641
-        from_file:
+        matcher: 2-aho
+        score: '90.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-1.0
-        spdx_license_expression: Artistic-1.0
-        rule_identifier: artistic-1.0_11.RULE
         rule_relevance: 90
+        rule_identifier: artistic-1.0_11.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE
         matched_text: the artistic license.
     identifier: artistic_1_0-2ff80857-def0-0ed3-86d0-f745062039f9
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1661
         end_line: 1662
-        from_file:
+        matcher: 1-hash
+        score: '95.0'
         matched_length: 22
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_39.RULE
         matched_text: |
           There is no license information in this distribution.
@@ -4981,32 +4981,32 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1670
         end_line: 1671
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_38.RULE
         matched_text: |
           As above, it is assumed that this file is licensed under the same terms
           as Perl itself.
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1679
         end_line: 1680
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or
@@ -5015,17 +5015,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1687
         end_line: 1689
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 40
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_23.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5035,17 +5035,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1696
         end_line: 1697
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5054,17 +5054,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1705
         end_line: 1706
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5073,34 +5073,34 @@ other_license_detections:
   - license_expression: artistic-perl-1.0
     license_expression_spdx: Artistic-1.0-Perl
     matches:
-      - score: '99.0'
+      - license_expression: artistic-perl-1.0
+        spdx_license_expression: Artistic-1.0-Perl
+        from_file:
         start_line: 1712
         end_line: 1712
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 8
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0
-        spdx_license_expression: Artistic-1.0-Perl
-        rule_identifier: artistic-perl-1.0_7.RULE
         rule_relevance: 99
+        rule_identifier: artistic-perl-1.0_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_7.RULE
         matched_text: This program is distributed under the Artistic License.
     identifier: artistic_perl_1_0-2d6db20c-52be-912f-b056-8d081e123f91
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1723
         end_line: 1724
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 23
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_7.RULE
         matched_text: |
           You may distribute under the terms of either the GNU General Public
@@ -5109,17 +5109,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1734
         end_line: 1735
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_10.RULE
         matched_text: |
           This library is free software; you can redistribute it and/or modify
@@ -5128,17 +5128,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1742
         end_line: 1743
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -5147,34 +5147,34 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1761
         end_line: 1761
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1768
         end_line: 1769
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 14
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_28.RULE
         matched_text: |
           You can use and redistribute this document under the same terms as Perl
@@ -5183,32 +5183,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1778
         end_line: 1779
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1781
         end_line: 1785
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 56
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_286.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_286.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_286.RULE
         matched_text: |
           Irrespective of its distribution, all code examples here are in the public
@@ -5220,17 +5220,17 @@ other_license_detections:
   - license_expression: artistic-2.0 AND public-domain-disclaimer
     license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
     matches:
-      - score: '100.0'
+      - license_expression: artistic-2.0 AND public-domain-disclaimer
+        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
+        from_file:
         start_line: 1794
         end_line: 1796
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 39
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-2.0 AND public-domain-disclaimer
-        spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer
-        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-2.0_and_public-domain-disclaimer_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_and_public-domain-disclaimer_1.RULE
         matched_text: |
           This document is available under the same terms as Perl itself. Code
@@ -5240,68 +5240,68 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1805
         end_line: 1805
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1814
         end_line: 1814
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1821
         end_line: 1821
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1836
         end_line: 1837
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify it under
@@ -5310,32 +5310,32 @@ other_license_detections:
   - license_expression: (gpl-1.0-plus OR artistic-perl-1.0) AND public-domain
     license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1844
         end_line: 1845
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: '19'
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_39.RULE
         matched_text: |
           This documentation is free; you can redistribute it and/or modify it
           under the same terms as Perl itself.
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 1847
         end_line: 1851
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 53
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_287.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_287.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_287.RULE
         matched_text: |
           Irrespective of its distribution, all code examples in these files are
@@ -5347,68 +5347,68 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1861
         end_line: 1861
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1868
         end_line: 1868
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 1875
         end_line: 1875
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 12
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_27.RULE
         matched_text: This document may be distributed under the same terms as Perl itself.
     identifier: gpl_1_0_plus_or_artistic_perl_1_0-59bdc9da-ad6a-3a9f-ac53-9fc77d62ac40
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 1891
         end_line: 1892
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 20
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_12.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -5417,18 +5417,18 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+          OR GPL-1.0-or-later
+        from_file:
         start_line: '1913'
         end_line: '1928'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 103
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-          OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_relevance: 100
+        rule_identifier: artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_artistic-dist-1.0_or_gpl-1.0-plus_2.RULE
         matched_text: |
           You may distribute the files contained in this distribution
@@ -5451,17 +5451,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0
     matches:
-      - score: '100.0'
+      - license_expression: artistic-dist-1.0
+        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
+        from_file:
         start_line: '1942'
         end_line: '1944'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 21
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-dist-1.0
-        spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0
-        rule_identifier: artistic-dist-1.0_3.RULE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_3.RULE
         matched_text: |
           This subdirectory contains unmodified 'dist' code that is
@@ -5471,17 +5471,17 @@ other_license_detections:
   - license_expression: artistic-dist-1.0 OR gpl-1.0-plus
     license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later
     matches:
-      - score: '100.0'
+      - 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
+        from_file:
         start_line: '1969'
         end_line: '1993'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 213
         match_coverage: '100.0'
-        matcher: 2-aho
-        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
-        rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_relevance: 100
+        rule_identifier: artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-dist-1.0_or_gpl-1.0-plus_1.RULE
         matched_text: |
           dist is distributed under a modified version of the Perl Artistic License.
@@ -5513,17 +5513,17 @@ other_license_detections:
   - license_expression: gpl-1.0-plus OR artistic-perl-1.0
     license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl
     matches:
-      - score: '100.0'
+      - license_expression: gpl-1.0-plus OR artistic-perl-1.0
+        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
+        from_file:
         start_line: 2000
         end_line: 2007
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 49
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-1.0-plus OR artistic-perl-1.0
-        spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl
-        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_relevance: 100
+        rule_identifier: gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-perl-1.0_17.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -5538,17 +5538,17 @@ other_license_detections:
   - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
     license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later
     matches:
-      - score: '95.0'
+      - license_expression: artistic-perl-1.0 OR gpl-1.0-plus
+        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
+        from_file:
         start_line: 2020
         end_line: 2023
-        from_file:
+        matcher: 2-aho
+        score: '95.0'
         matched_length: 26
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: artistic-perl-1.0 OR gpl-1.0-plus
-        spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later
-        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_relevance: 95
+        rule_identifier: artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_or_gpl-1.0-plus_36.RULE
         matched_text: |
           may be redistributed
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 89f3aaa53e5..2c1fbab45e7 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-3.0-plus AND gfdl-1.3-plus
     license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later
     matches:
-      - score: '98.28'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 11
         end_line: 17
-        from_file:
+        matcher: 2-aho
+        score: '98.28'
         matched_length: 57
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_285.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_285.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_285.RULE
         matched_text: |
           GNU sed is free software; you can redistribute it and/or modify it under
@@ -27,17 +27,17 @@ license_detections:
 
           On Debian GNU/Linux systems you can find a copy of the GPL in
           /usr/share/common-licenses/GPL-3
-      - score: '96.97'
+      - license_expression: gfdl-1.3-plus
+        spdx_license_expression: GFDL-1.3-or-later
+        from_file:
         start_line: '19'
         end_line: 21
-        from_file:
+        matcher: 2-aho
+        score: '96.97'
         matched_length: 32
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gfdl-1.3-plus
-        spdx_license_expression: GFDL-1.3-or-later
-        rule_identifier: gfdl-1.3-plus_5.RULE
         rule_relevance: 100
+        rule_identifier: gfdl-1.3-plus_5.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gfdl-1.3-plus_5.RULE
         matched_text: |
           The sed info manual is released under the terms of the GNU Free
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 23f37c5eb7e..3fd12940338 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
@@ -12,30 +12,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 33
         end_line: 33
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 34
         end_line: 48
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 124
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_735.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_735.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_735.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
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 7be8aed2acd..58163a6541d 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
@@ -7,17 +7,17 @@ license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 20
         end_line: 26
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 65
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_283.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_283.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_283.RULE
         matched_text: "This program is free software; you can redistribute it and/or modify\
           \ it\n   under the terms of the GNU General Public License as published by the\n \
@@ -28,17 +28,17 @@ license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 32
         end_line: 38
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 65
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_734.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_734.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_734.RULE
         matched_text: "This program is free software; you can redistribute it and/or modify\
           \ it\n   under the terms of the GNU General Public License as published by the\n \
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 147339b9015..bc7191dbd79 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
@@ -74,17 +74,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 345
         end_line: 346
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 17
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_28.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_28.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_28.RULE
         matched_text: |
           No copyright is claimed.  This code is in the public domain; do with
@@ -93,30 +93,30 @@ other_license_detections:
   - license_expression: gpl-2.0
     license_expression_spdx: GPL-2.0-only
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 350
         end_line: 350
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_561.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_561.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE
         matched_text: 'License: gpl-2'
-      - score: '100.0'
+      - license_expression: gpl-2.0
+        spdx_license_expression: GPL-2.0-only
+        from_file:
         start_line: 351
         end_line: 365
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 125
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0
-        spdx_license_expression: GPL-2.0-only
-        rule_identifier: gpl-2.0_1189.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0_1189.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1189.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -138,30 +138,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 367
         end_line: 367
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 368
         end_line: 383
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 137
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_906.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_906.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_906.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -184,30 +184,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 385
         end_line: 385
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 386
         end_line: 400
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_416.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_416.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_416.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -229,17 +229,17 @@ other_license_detections:
   - license_expression: bsd-simplified
     license_expression_spdx: BSD-2-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified
+        spdx_license_expression: BSD-2-Clause
+        from_file:
         start_line: 403
         end_line: 410
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 70
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-simplified
-        spdx_license_expression: BSD-2-Clause
-        rule_identifier: bsd-simplified_264.RULE
         rule_relevance: 100
+        rule_identifier: bsd-simplified_264.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_264.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -254,17 +254,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 413
         end_line: 437
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 215
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_1063.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_1063.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1063.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -296,17 +296,17 @@ other_license_detections:
   - license_expression: bsd-original-uc
     license_expression_spdx: BSD-4-Clause-UC
     matches:
-      - score: '100.0'
+      - license_expression: bsd-original-uc
+        spdx_license_expression: BSD-4-Clause-UC
+        from_file:
         start_line: 440
         end_line: 466
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 243
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-original-uc
-        spdx_license_expression: BSD-4-Clause-UC
-        rule_identifier: bsd-original-uc_3.RULE
         rule_relevance: 100
+        rule_identifier: bsd-original-uc_3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -340,30 +340,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus AND lgpl-2.1-plus
     license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 468
         end_line: 468
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 2
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_51.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE
         matched_text: 'License: lgpl'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 469
         end_line: 473
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 37
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_345.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_345.RULE
         matched_text: |
           This file may be redistributed under the terms of the
@@ -375,30 +375,30 @@ other_license_detections:
   - license_expression: lgpl-2.0-plus
     license_expression_spdx: LGPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 475
         end_line: 475
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_61.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_61.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.0-plus
+        spdx_license_expression: LGPL-2.0-or-later
+        from_file:
         start_line: 476
         end_line: 490
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 126
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.0-plus
-        spdx_license_expression: LGPL-2.0-or-later
-        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.0-plus_477.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_477.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -420,30 +420,30 @@ other_license_detections:
   - license_expression: lgpl-2.1-plus
     license_expression_spdx: LGPL-2.1-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 492
         end_line: 492
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_108.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_108.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-2.1-plus
+        spdx_license_expression: LGPL-2.1-or-later
+        from_file:
         start_line: 493
         end_line: 508
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 141
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-2.1-plus
-        spdx_license_expression: LGPL-2.1-or-later
-        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-2.1-plus_344.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_344.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or modify
@@ -466,30 +466,30 @@ other_license_detections:
   - license_expression: lgpl-3.0-plus
     license_expression_spdx: LGPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 510
         end_line: 510
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_166.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_166.RULE
         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+'
-      - score: '100.0'
+      - license_expression: lgpl-3.0-plus
+        spdx_license_expression: LGPL-3.0-or-later
+        from_file:
         start_line: 511
         end_line: 525
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 127
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: lgpl-3.0-plus
-        spdx_license_expression: LGPL-3.0-or-later
-        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_relevance: 100
+        rule_identifier: lgpl-3.0-plus_206.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_206.RULE
         matched_text: |
           This package is free software; you can redistribute it and/or
@@ -511,17 +511,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 528
         end_line: 546
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person
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 682a2ba8a64..8d99a2edbd7 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
@@ -13,17 +13,17 @@ other_license_detections:
   - license_expression: zlib
     license_expression_spdx: Zlib
     matches:
-      - score: '100.0'
+      - license_expression: zlib
+        spdx_license_expression: Zlib
+        from_file:
         start_line: 57
         end_line: 74
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 144
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zlib
-        spdx_license_expression: Zlib
-        rule_identifier: zlib_17.RULE
         rule_relevance: 100
+        rule_identifier: zlib_17.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE
         matched_text: |
           This software is provided 'as-is', without any express or implied
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 2847eb4408f..40949b89a94 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,30 +36,30 @@ other_license_detections:
   - license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 71
         end_line: 71
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 4
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_65.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_65.RULE
         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'
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 72
         end_line: 88
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 145
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_971.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_971.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_971.RULE
         matched_text: |
           Licensed to the Apache Software Foundation (ASF) under one or more
@@ -83,17 +83,17 @@ other_license_detections:
   - license_expression: zeusbench
     license_expression_spdx: LicenseRef-scancode-zeusbench
     matches:
-      - score: '100.0'
+      - license_expression: zeusbench
+        spdx_license_expression: LicenseRef-scancode-zeusbench
+        from_file:
         start_line: 94
         end_line: 103
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: zeusbench
-        spdx_license_expression: LicenseRef-scancode-zeusbench
-        rule_identifier: zeusbench_1.RULE
         rule_relevance: 100
+        rule_identifier: zeusbench_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zeusbench_1.RULE
         matched_text: |
           This software is provided "as is" and any express or implied warranties,
@@ -110,17 +110,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 118
         end_line: 142
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_879.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -152,17 +152,17 @@ other_license_detections:
   - license_expression: x11-keith-packard AND metamail
     license_expression_spdx: HPND-sell-variant AND metamail
     matches:
-      - score: '100.0'
+      - license_expression: x11-keith-packard
+        spdx_license_expression: HPND-sell-variant
+        from_file:
         start_line: 172
         end_line: '191'
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 168
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: x11-keith-packard
-        spdx_license_expression: HPND-sell-variant
-        rule_identifier: x11-keith-packard3.RULE
         rule_relevance: 100
+        rule_identifier: x11-keith-packard3.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-keith-packard3.RULE
         matched_text: |
           Permission to use, copy, modify, distribute, and sell this software
@@ -185,17 +185,17 @@ other_license_detections:
           AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
           OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
           SOFTWARE.
-      - score: '100.0'
+      - license_expression: metamail
+        spdx_license_expression: metamail
+        from_file:
         start_line: '197'
         end_line: 206
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 87
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: metamail
-        spdx_license_expression: metamail
-        rule_identifier: metamail.LICENSE
         rule_relevance: 100
+        rule_identifier: metamail.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/metamail.LICENSE
         matched_text: |
           Permission to use, copy, modify, and distribute this material
@@ -212,30 +212,30 @@ other_license_detections:
   - license_expression: gpl-3.0-plus
     license_expression_spdx: GPL-3.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 209
         end_line: 209
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_92.RULE
         rule_relevance: 100
+        rule_identifier: gpl-3.0-plus_92.RULE
         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+'
-      - score: '99.0'
+      - license_expression: gpl-3.0-plus
+        spdx_license_expression: GPL-3.0-or-later
+        from_file:
         start_line: 210
         end_line: 222
-        from_file:
+        matcher: 1-hash
+        score: '99.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-3.0-plus
-        spdx_license_expression: GPL-3.0-or-later
-        rule_identifier: gpl-3.0-plus_483.RULE
         rule_relevance: 99
+        rule_identifier: gpl-3.0-plus_483.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_483.RULE
         matched_text: |
           This program is free software: you can redistribute it and/or modify
@@ -255,30 +255,30 @@ other_license_detections:
   - license_expression: gpl-2.0-plus
     license_expression_spdx: GPL-2.0-or-later
     matches:
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 224
         end_line: 224
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 3
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_22.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_22.RULE
         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+'
-      - score: '100.0'
+      - license_expression: gpl-2.0-plus
+        spdx_license_expression: GPL-2.0-or-later
+        from_file:
         start_line: 225
         end_line: 237
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 105
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: gpl-2.0-plus
-        spdx_license_expression: GPL-2.0-or-later
-        rule_identifier: gpl-2.0-plus_986.RULE
         rule_relevance: 100
+        rule_identifier: gpl-2.0-plus_986.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_986.RULE
         matched_text: |
           This program is free software; you can redistribute it and/or
@@ -298,17 +298,17 @@ other_license_detections:
   - license_expression: public-domain
     license_expression_spdx: LicenseRef-scancode-public-domain
     matches:
-      - score: '100.0'
+      - license_expression: public-domain
+        spdx_license_expression: LicenseRef-scancode-public-domain
+        from_file:
         start_line: 240
         end_line: 272
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 211
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: public-domain
-        spdx_license_expression: LicenseRef-scancode-public-domain
-        rule_identifier: public-domain_361.RULE
         rule_relevance: 100
+        rule_identifier: public-domain_361.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_361.RULE
         matched_text: |
           This imagemap module started as a port of the original imagemap.c
@@ -348,17 +348,17 @@ other_license_detections:
   - license_expression: bsd-simplified-darwin
     license_expression_spdx: LicenseRef-scancode-bsd-simplified-darwin
     matches:
-      - score: '100.0'
+      - license_expression: bsd-simplified-darwin
+        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
+        from_file:
         start_line: 279
         end_line: 302
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 217
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bsd-simplified-darwin
-        spdx_license_expression: LicenseRef-scancode-bsd-simplified-darwin
-        rule_identifier: bsd-simplified-darwin.LICENSE
         rule_relevance: 100
+        rule_identifier: bsd-simplified-darwin.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE
         matched_text: |
           This software is not subject to any export provision of the United States
@@ -389,34 +389,34 @@ other_license_detections:
   - license_expression: apache-2.0 AND hs-regexp
     license_expression_spdx: Apache-2.0 AND Spencer-94
     matches:
-      - score: '100.0'
+      - license_expression: apache-2.0
+        spdx_license_expression: Apache-2.0
+        from_file:
         start_line: 306
         end_line: 309
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 47
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: apache-2.0
-        spdx_license_expression: Apache-2.0
-        rule_identifier: apache-2.0_1021.RULE
         rule_relevance: 100
+        rule_identifier: apache-2.0_1021.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1021.RULE
         matched_text: |
           This software was submitted by Cisco Systems to the Apache Software Foundation in July
           1997.  Future revisions and derivatives of this source code must
           acknowledge Cisco Systems as the original contributor of this module.
           All other licensing and usage conditions are those of the Apache Software Foundation.
-      - score: '100.0'
+      - license_expression: hs-regexp
+        spdx_license_expression: Spencer-94
+        from_file:
         start_line: 317
         end_line: 335
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 148
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: hs-regexp
-        spdx_license_expression: Spencer-94
-        rule_identifier: hs-regexp_1.RULE
         rule_relevance: 100
+        rule_identifier: hs-regexp_1.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/hs-regexp_1.RULE
         matched_text: |
           This software is not subject to any license of the American Telephone and
@@ -442,17 +442,17 @@ other_license_detections:
   - license_expression: bsd-unchanged
     license_expression_spdx: LicenseRef-scancode-bsd-unchanged
     matches:
-      - score: '100.0'
+      - license_expression: bsd-unchanged
+        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
+        from_file:
         start_line: 370
         end_line: 391
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 208
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-unchanged
-        spdx_license_expression: LicenseRef-scancode-bsd-unchanged
-        rule_identifier: bsd-unchanged_4.RULE
         rule_relevance: 100
+        rule_identifier: bsd-unchanged_4.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-unchanged_4.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -481,17 +481,17 @@ other_license_detections:
   - license_expression: bsd-new
     license_expression_spdx: BSD-3-Clause
     matches:
-      - score: '100.0'
+      - license_expression: bsd-new
+        spdx_license_expression: BSD-3-Clause
+        from_file:
         start_line: 395
         end_line: 419
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 214
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: bsd-new
-        spdx_license_expression: BSD-3-Clause
-        rule_identifier: bsd-new_879.RULE
         rule_relevance: 100
+        rule_identifier: bsd-new_879.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_879.RULE
         matched_text: |
           Redistribution and use in source and binary forms, with or without
@@ -523,17 +523,17 @@ other_license_detections:
   - license_expression: bison-exception-2.2
     license_expression_spdx: Bison-exception-2.2
     matches:
-      - score: '100.0'
+      - license_expression: bison-exception-2.2
+        spdx_license_expression: Bison-exception-2.2
+        from_file:
         start_line: 422
         end_line: 433
-        from_file:
+        matcher: 2-aho
+        score: '100.0'
         matched_length: 106
         match_coverage: '100.0'
-        matcher: 2-aho
-        license_expression: bison-exception-2.2
-        spdx_license_expression: Bison-exception-2.2
-        rule_identifier: bison-exception-2.2.LICENSE
         rule_relevance: 100
+        rule_identifier: bison-exception-2.2.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bison-exception-2.2.LICENSE
         matched_text: |
           As a special exception, you may create a larger work that contains
@@ -552,17 +552,17 @@ other_license_detections:
   - license_expression: mit
     license_expression_spdx: MIT
     matches:
-      - score: '100.0'
+      - license_expression: mit
+        spdx_license_expression: MIT
+        from_file:
         start_line: 439
         end_line: 454
-        from_file:
+        matcher: 1-hash
+        score: '100.0'
         matched_length: 161
         match_coverage: '100.0'
-        matcher: 1-hash
-        license_expression: mit
-        spdx_license_expression: MIT
-        rule_identifier: mit.LICENSE
         rule_relevance: 100
+        rule_identifier: mit.LICENSE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a copy of
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 4ab718fc66d..80068c40193 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
@@ -41,17 +41,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "artistic-2.0",
+            "license_expression_spdx": "Artistic-2.0",
             "from_file": "scan/package.json",
             "start_line": 198,
             "end_line": 198,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "artistic-2.0",
-            "license_expression_spdx": "Artistic-2.0",
-            "rule_identifier": "artistic-2.0_46.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "artistic-2.0_46.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
             "matched_text": null
           }
@@ -64,17 +64,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "boost-1.0",
+            "license_expression_spdx": "BSL-1.0",
             "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
             "start_line": 4,
             "end_line": 5,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 32,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "boost-1.0",
-            "license_expression_spdx": "BSL-1.0",
-            "rule_identifier": "boost-1.0_21.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "boost-1.0_21.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
             "matched_text": null
           }
@@ -87,17 +87,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 14,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "cc-by-2.5",
-            "license_expression_spdx": "CC-BY-2.5",
-            "rule_identifier": "cc-by-2.5_4.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "cc-by-2.5_4.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
             "matched_text": null
           }
@@ -110,17 +110,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 99.69,
+            "license_expression": "cc0-1.0",
+            "license_expression_spdx": "CC0-1.0",
             "from_file": "scan/cc0-1.0.LICENSE",
             "start_line": 1,
             "end_line": 98,
+            "matcher": "3-seq",
+            "score": 99.69,
             "matched_length": 978,
             "match_coverage": 99.69,
-            "matcher": "3-seq",
-            "license_expression": "cc0-1.0",
-            "license_expression_spdx": "CC0-1.0",
-            "rule_identifier": "cc0-1.0_155.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "cc0-1.0_155.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
             "matched_text": null
           }
@@ -133,17 +133,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0-plus WITH ada-linking-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,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 176,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-            "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
-            "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
             "matched_text": null
           }
@@ -156,17 +156,17 @@
         "detection_count": 3,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1-plus",
+            "license_expression_spdx": "LGPL-2.1-or-later",
             "from_file": "scan/JGroups/src/FixedMembershipToken.java",
             "start_line": 7,
             "end_line": 20,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 125,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-2.1-plus",
-            "license_expression_spdx": "LGPL-2.1-or-later",
-            "rule_identifier": "lgpl-2.1-plus_59.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1-plus_59.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
             "matched_text": null
           }
@@ -179,17 +179,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit-old-style",
+            "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
             "from_file": "scan/zlib/iostream2/zstream.h",
             "start_line": 9,
             "end_line": 15,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 71,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "mit-old-style",
-            "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
-            "rule_identifier": "mit-old-style_cmr-no_1.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "mit-old-style_cmr-no_1.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
             "matched_text": null
           }
@@ -202,32 +202,32 @@
         "detection_count": 7,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "from_file": "scan/arch/adler32.c",
             "start_line": 3,
             "end_line": 3,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 12,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "zlib",
-            "license_expression_spdx": "Zlib",
-            "rule_identifier": "zlib_5.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "zlib_5.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
             "matched_text": null
           },
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "from_file": "scan/arch/zlib.h",
             "start_line": 6,
             "end_line": 23,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 144,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "zlib",
-            "license_expression_spdx": "Zlib",
-            "rule_identifier": "zlib_17.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "zlib_17.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
             "matched_text": null
           }
@@ -240,17 +240,17 @@
         "detection_count": 2,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "from_file": "scan/zlib/infback9/infback9.c",
             "start_line": 3,
             "end_line": 3,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 12,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "zlib",
-            "license_expression_spdx": "Zlib",
-            "rule_identifier": "zlib_5.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "zlib_5.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
             "matched_text": null
           }
@@ -263,17 +263,17 @@
         "detection_count": 2,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "from_file": "scan/arch/zlib.h",
             "start_line": 6,
             "end_line": 23,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 144,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "zlib",
-            "license_expression_spdx": "Zlib",
-            "rule_identifier": "zlib_17.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "zlib_17.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
             "matched_text": null
           }
@@ -286,17 +286,17 @@
         "detection_count": 1,
         "sample_matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "license_expression_spdx": "Zlib",
             "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
             "start_line": 17,
             "end_line": 31,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 132,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "zlib",
-            "license_expression_spdx": "Zlib",
-            "rule_identifier": "zlib.LICENSE",
             "rule_relevance": 100,
+            "rule_identifier": "zlib.LICENSE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
             "matched_text": null
           }
@@ -584,17 +584,17 @@
             "license_expression_spdx": "CC0-1.0",
             "matches": [
               {
-                "score": 99.69,
+                "license_expression": "cc0-1.0",
+                "spdx_license_expression": "CC0-1.0",
+                "from_file": "scan/cc0-1.0.LICENSE",
                 "start_line": 1,
                 "end_line": 98,
-                "from_file": "scan/cc0-1.0.LICENSE",
+                "matcher": "3-seq",
+                "score": 99.69,
                 "matched_length": 978,
                 "match_coverage": 99.69,
-                "matcher": "3-seq",
-                "license_expression": "cc0-1.0",
-                "spdx_license_expression": "CC0-1.0",
-                "rule_identifier": "cc0-1.0_155.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "cc0-1.0_155.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
               }
             ],
@@ -647,17 +647,17 @@
             "license_expression_spdx": "Artistic-2.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "artistic-2.0",
+                "spdx_license_expression": "Artistic-2.0",
+                "from_file": "scan/package.json",
                 "start_line": 198,
                 "end_line": 198,
-                "from_file": "scan/package.json",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 4,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "artistic-2.0",
-                "spdx_license_expression": "Artistic-2.0",
-                "rule_identifier": "artistic-2.0_46.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "artistic-2.0_46.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
               }
             ],
@@ -798,31 +798,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/arch/adler32.c",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/arch/adler32.c",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/arch/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/arch/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -890,17 +890,17 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/arch/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/arch/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -965,31 +965,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/arch/zutil.h",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/arch/zutil.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/arch/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/arch/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -1139,17 +1139,17 @@
             "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
+                "from_file": "scan/JGroups/src/FixedMembershipToken.java",
                 "start_line": 7,
                 "end_line": 20,
-                "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 125,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-2.1-plus",
-                "spdx_license_expression": "LGPL-2.1-or-later",
-                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
               }
             ],
@@ -1214,17 +1214,17 @@
             "license_expression_spdx": "CC-BY-2.5",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "cc-by-2.5",
+                "spdx_license_expression": "CC-BY-2.5",
+                "from_file": "scan/JGroups/src/GuardedBy.java",
                 "start_line": 4,
                 "end_line": 5,
-                "from_file": "scan/JGroups/src/GuardedBy.java",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 14,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "cc-by-2.5",
-                "spdx_license_expression": "CC-BY-2.5",
-                "rule_identifier": "cc-by-2.5_4.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "cc-by-2.5_4.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
               }
             ],
@@ -1295,17 +1295,17 @@
             "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
+                "from_file": "scan/JGroups/src/ImmutableReference.java",
                 "start_line": 7,
                 "end_line": 20,
-                "from_file": "scan/JGroups/src/ImmutableReference.java",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 125,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-2.1-plus",
-                "spdx_license_expression": "LGPL-2.1-or-later",
-                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
               }
             ],
@@ -1464,17 +1464,17 @@
             "license_expression_spdx": "LGPL-2.1-or-later",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "lgpl-2.1-plus",
+                "spdx_license_expression": "LGPL-2.1-or-later",
+                "from_file": "scan/JGroups/src/RouterStubManager.java",
                 "start_line": 7,
                 "end_line": 20,
-                "from_file": "scan/JGroups/src/RouterStubManager.java",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 125,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "lgpl-2.1-plus",
-                "spdx_license_expression": "LGPL-2.1-or-later",
-                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "lgpl-2.1-plus_59.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
               }
             ],
@@ -1627,31 +1627,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/adler32.c",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/adler32.c",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -1719,31 +1719,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/deflate.c",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/deflate.c",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -1811,31 +1811,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/deflate.h",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/deflate.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -1903,17 +1903,17 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -1978,31 +1978,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zutil.c",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/zutil.c",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -2070,31 +2070,31 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zutil.h",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/zutil.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               },
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/zlib.h",
                 "start_line": 6,
                 "end_line": 23,
-                "from_file": "scan/zlib/zlib.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 144,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_17.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_17.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
               }
             ],
@@ -2203,17 +2203,17 @@
             "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+                "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
+                "from_file": "scan/zlib/ada/zlib.ads",
                 "start_line": 6,
                 "end_line": 25,
-                "from_file": "scan/zlib/ada/zlib.ads",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 176,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-                "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
-                "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
               }
             ],
@@ -2372,17 +2372,17 @@
             "license_expression_spdx": "BSL-1.0",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "boost-1.0",
+                "spdx_license_expression": "BSL-1.0",
+                "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
                 "start_line": 4,
                 "end_line": 5,
-                "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 32,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "boost-1.0",
-                "spdx_license_expression": "BSL-1.0",
-                "rule_identifier": "boost-1.0_21.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "boost-1.0_21.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
               }
             ],
@@ -2488,17 +2488,17 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
                 "start_line": 17,
                 "end_line": 31,
-                "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 132,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib.LICENSE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib.LICENSE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
               }
             ],
@@ -2610,17 +2610,17 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/infback9/infback9.c",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/infback9/infback9.c",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               }
             ],
@@ -2685,17 +2685,17 @@
             "license_expression_spdx": "Zlib",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "zlib",
+                "spdx_license_expression": "Zlib",
+                "from_file": "scan/zlib/infback9/infback9.h",
                 "start_line": 3,
                 "end_line": 3,
-                "from_file": "scan/zlib/infback9/infback9.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 12,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "zlib",
-                "spdx_license_expression": "Zlib",
-                "rule_identifier": "zlib_5.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "zlib_5.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
               }
             ],
@@ -2801,17 +2801,17 @@
             "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
             "matches": [
               {
-                "score": 100.0,
+                "license_expression": "mit-old-style",
+                "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
+                "from_file": "scan/zlib/iostream2/zstream.h",
                 "start_line": 9,
                 "end_line": 15,
-                "from_file": "scan/zlib/iostream2/zstream.h",
+                "matcher": "2-aho",
+                "score": 100.0,
                 "matched_length": 71,
                 "match_coverage": 100.0,
-                "matcher": "2-aho",
-                "license_expression": "mit-old-style",
-                "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
-                "rule_identifier": "mit-old-style_cmr-no_1.RULE",
                 "rule_relevance": 100,
+                "rule_identifier": "mit-old-style_cmr-no_1.RULE",
                 "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
               }
             ],
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 1503b509d09..aa6c04ceb6b 100644
--- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
+++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "base64-arraybuffer-0.1.4/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -62,17 +62,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "base64-arraybuffer-0.1.4/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
               "matched_text": "https://github.com/niklasvh/base64-arraybuffer/blob/master/LICENSE-MIT"
             }
@@ -180,17 +180,17 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/README.md",
           "start_line": 20,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_12.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_12.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE",
           "matched_text": null
         }
@@ -203,17 +203,17 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_30.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
           "matched_text": "https://github.com/niklasvh/base64-arraybuffer/blob/master/LICENSE-MIT"
         }
@@ -226,17 +226,17 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_url": null,
           "matched_text": "MIT"
         }
@@ -249,17 +249,17 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT",
           "start_line": 3,
           "end_line": 22,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "mit.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
           "matched_text": null
         }
@@ -272,32 +272,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/package.json",
           "start_line": 18,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_272.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_272.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
           "matched_text": null
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "base64-arraybuffer-0.1.4/package.json",
           "start_line": 21,
           "end_line": 21,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_30.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
           "matched_text": null
         }
@@ -409,17 +409,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT",
               "start_line": 3,
               "end_line": 22,
-              "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -480,17 +480,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/README.md",
               "start_line": 20,
               "end_line": 20,
-              "from_file": "base64-arraybuffer-0.1.4/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_12.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE"
             }
           ],
@@ -588,17 +588,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/lib/base64-arraybuffer.js",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "base64-arraybuffer-0.1.4/lib/base64-arraybuffer.js",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_12.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE"
             }
           ],
@@ -688,17 +688,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "base64-arraybuffer-0.1.4/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "base64-arraybuffer-0.1.4/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -710,17 +710,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "base64-arraybuffer-0.1.4/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "base64-arraybuffer-0.1.4/package.json",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_30.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_30.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
                   "matched_text": "https://github.com/niklasvh/base64-arraybuffer/blob/master/LICENSE-MIT"
                 }
@@ -806,31 +806,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/package.json",
               "start_line": 18,
               "end_line": 20,
-              "from_file": "base64-arraybuffer-0.1.4/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_272.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_272.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "base64-arraybuffer-0.1.4/package.json",
               "start_line": 21,
               "end_line": 21,
-              "from_file": "base64-arraybuffer-0.1.4/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
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 d79cdd51645..2d97ea813c9 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
@@ -11,26 +11,24 @@
         "license_expression_spdx": "Borceux",
         "matches": [
           {
-            "score": 4.71,
+            "license_expression": "borceux",
+            "license_expression_spdx": "Borceux",
             "from_file": "README.multi-orig-tarball-package",
             "start_line": 1,
             "end_line": 3,
+            "is_license_text": true,
+            "matcher": "3-seq",
+            "score": 4.71,
             "matched_length": 4,
+            "rule_length": 85,
             "match_coverage": 4.71,
-            "matcher": "3-seq",
-            "license_expression": "borceux",
-            "license_expression_spdx": "Borceux",
-            "rule_identifier": "borceux.LICENSE",
             "rule_relevance": 100,
+            "rule_identifier": "borceux.LICENSE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
-            "is_license_text": true,
-            "is_builtin": true,
-            "is_from_license": true,
-            "rule_length": 85,
-            "rule_text": "Copyright 1993 Francis Borceux\nYou may freely use, modify, and/or distribute each of the files in this package without limitation.  The package consists of the following files:\n\nREADME\ncompatibility/OldDiagram\ncompatibility/OldMaxiDiagram\ncompatibility/OldMicroDiagram\ncompatibility/OldMiniDiagram\ncompatibility/OldMultipleArrows\ndiagram/Diagram\ndiagram/MaxiDiagram\ndiagram/MicroDiagram\ndiagram/MiniDiagram\ndiagram/MultipleArrows\nuser-guides/Diagram_Mode_d_Emploi\nuser-guides/Diagram_Read_Me\n\nOf course no support is guaranteed, but the author will attempt to assist with problems.  Current email address:\nfrancis dot borceux at uclouvain dot be.",
             "rule_notes": null,
             "referenced_filenames": [],
-            "matched_text": "package consists of [various] [tarballs].\n\n[This] README"
+            "matched_text": "package consists of [various] [tarballs].\n\n[This] README",
+            "rule_text": "Copyright 1993 Francis Borceux\nYou may freely use, modify, and/or distribute each of the files in this package without limitation.  The package consists of the following files:\n\nREADME\ncompatibility/OldDiagram\ncompatibility/OldMaxiDiagram\ncompatibility/OldMicroDiagram\ncompatibility/OldMiniDiagram\ncompatibility/OldMultipleArrows\ndiagram/Diagram\ndiagram/MaxiDiagram\ndiagram/MicroDiagram\ndiagram/MiniDiagram\ndiagram/MultipleArrows\nuser-guides/Diagram_Mode_d_Emploi\nuser-guides/Diagram_Read_Me\n\nOf course no support is guaranteed, but the author will attempt to assist with problems.  Current email address:\nfrancis dot borceux at uclouvain dot be."
           }
         ],
         "detection_log": [
@@ -49,17 +47,17 @@
       "license_detections": [],
       "license_clues": [
         {
-          "score": 4.71,
+          "license_expression": "borceux",
+          "spdx_license_expression": "Borceux",
+          "from_file": "README.multi-orig-tarball-package",
           "start_line": 1,
           "end_line": 3,
-          "from_file": "README.multi-orig-tarball-package",
+          "matcher": "3-seq",
+          "score": 4.71,
           "matched_length": 4,
           "match_coverage": 4.71,
-          "matcher": "3-seq",
-          "license_expression": "borceux",
-          "spdx_license_expression": "Borceux",
-          "rule_identifier": "borceux.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "borceux.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
           "matched_text": "package consists of [various] [tarballs].\n\n[This] README"
         }
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 6eb19e2167d..68387095e38 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
@@ -10,17 +10,17 @@
       ],
       "sample_matches": [
         {
-          "score": 86.89,
+          "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "from_file": "unknown-license.txt",
           "start_line": 1,
           "end_line": 10,
+          "matcher": "6-unknown",
+          "score": 86.89,
           "matched_length": 53,
           "match_coverage": 100.0,
-          "matcher": "6-unknown",
-          "license_expression": "unknown",
-          "license_expression_spdx": "LicenseRef-scancode-unknown",
-          "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
           "rule_relevance": 100,
+          "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
           "rule_url": null,
           "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
         }
@@ -38,26 +38,24 @@
         "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
-            "score": 86.89,
+            "license_expression": "unknown",
+            "license_expression_spdx": "LicenseRef-scancode-unknown",
             "from_file": "unknown-license.txt",
             "start_line": 1,
             "end_line": 10,
+            "is_license_notice": true,
+            "matcher": "6-unknown",
+            "score": 86.89,
             "matched_length": 53,
+            "rule_length": 53,
             "match_coverage": 100.0,
-            "matcher": "6-unknown",
-            "license_expression": "unknown",
-            "license_expression_spdx": "LicenseRef-scancode-unknown",
-            "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
             "rule_relevance": 100,
+            "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
             "rule_url": null,
-            "is_license_notice": true,
-            "is_builtin": true,
-            "is_synthetic": true,
-            "rule_length": 53,
-            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof.",
             "rule_notes": "Unknown license based on a composite of license words.",
             "referenced_filenames": [],
-            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
+            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof.",
+            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
           }
         ],
         "detection_log": [
@@ -79,17 +77,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 86.89,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "unknown-license.txt",
               "start_line": 1,
               "end_line": 10,
-              "from_file": "unknown-license.txt",
+              "matcher": "6-unknown",
+              "score": 86.89,
               "matched_length": 53,
               "match_coverage": 100.0,
-              "matcher": "6-unknown",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
+              "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_url": null,
               "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
             }
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 96dcc0ab217..d8fce0527f3 100644
--- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
+++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
@@ -7,17 +7,17 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 86.89,
+          "license_expression": "unknown",
+          "license_expression_spdx": "LicenseRef-scancode-unknown",
           "from_file": "unknown-license.txt",
           "start_line": 1,
           "end_line": 10,
+          "matcher": "6-unknown",
+          "score": 86.89,
           "matched_length": 53,
           "match_coverage": 100.0,
-          "matcher": "6-unknown",
-          "license_expression": "unknown",
-          "license_expression_spdx": "LicenseRef-scancode-unknown",
-          "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
           "rule_relevance": 100,
+          "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
           "rule_url": null,
           "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
         }
@@ -35,26 +35,24 @@
         "license_expression_spdx": "LicenseRef-scancode-unknown",
         "matches": [
           {
-            "score": 86.89,
+            "license_expression": "unknown",
+            "license_expression_spdx": "LicenseRef-scancode-unknown",
             "from_file": "unknown-license.txt",
             "start_line": 1,
             "end_line": 10,
+            "is_license_notice": true,
+            "matcher": "6-unknown",
+            "score": 86.89,
             "matched_length": 53,
+            "rule_length": 53,
             "match_coverage": 100.0,
-            "matcher": "6-unknown",
-            "license_expression": "unknown",
-            "license_expression_spdx": "LicenseRef-scancode-unknown",
-            "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
             "rule_relevance": 100,
+            "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
             "rule_url": null,
-            "is_license_notice": true,
-            "is_builtin": true,
-            "is_synthetic": true,
-            "rule_length": 53,
-            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
             "rule_notes": "Unknown license based on a composite of license words.",
             "referenced_filenames": [],
-            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
+            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
+            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
           }
         ],
         "detection_log": [],
@@ -74,17 +72,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 86.89,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "unknown-license.txt",
               "start_line": 1,
               "end_line": 10,
-              "from_file": "unknown-license.txt",
+              "matcher": "6-unknown",
+              "score": 86.89,
               "matched_length": 53,
               "match_coverage": 100.0,
-              "matcher": "6-unknown",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_relevance": 100,
+              "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_url": null,
               "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
             }

From d96e69ec2bed54d2a718d73e7290cd5c4806be74 Mon Sep 17 00:00:00 2001
From: Shaikh Mohd Tehami 
Date: Thu, 14 Sep 2023 13:06:18 +0000
Subject: [PATCH 07/11] updated main.py to handle matched_text_diagnostics
 seperately

Signed-off-by: Shaikh Mohd Tehami 
---
 src/licensedcode/match.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index 62164b64c8d..a7e429984d7 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -780,9 +780,11 @@ def to_dict(
         Return a "result" scan data built from a LicenseMatch object.
         """
         matched_text = None
+        matched_text_diagnostics = None
+
         if include_text:
             if license_text_diagnostics:
-                matched_text = self.matched_text(whole_lines=False, highlight=True)
+                matched_text_diagnostics = self.matched_text(whole_lines=False, highlight=True)
             else:
                 if whole_lines:
                     matched_text = self.matched_text(whole_lines=True, highlight=False)
@@ -806,6 +808,8 @@ def to_dict(
 
         if include_text:
             result['matched_text'] = matched_text
+            if license_text_diagnostics:
+               result['matched_text_diagnostics'] = matched_text_diagnostics
         return result
 
     def get_highlighted_text(self, trace=TRACE_HIGHLIGHTED_TEXT):

From 2ddb31c36a1316fc66f97d2d0943a0d7e852dcf7 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Wed, 13 Dec 2023 21:24:31 +0530
Subject: [PATCH 08/11] Add new attribute `matched_text_diagnostics`

This commit adds a new attribute for license text diagnostics
which will be added when the CLI option `--license-text-diagnostics`
is used, in contrast to earlier behaviour, where this diagnostics
matched text used to overwrite the text in `matched_text`.

Also makes sure top-level license/package summarizations have
matched text and diagnostics correcttly only when the respective
CLI options are used.

Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/detection.py                 |   29 +-
 src/licensedcode/match.py                     |   14 +-
 src/licensedcode/plugin_license.py            |    8 +-
 src/packagedcode/plugin_package.py            |    2 +-
 src/summarycode/todo.py                       |   28 +-
 .../filtered-expected.json                    |   25 +-
 .../filtered-expected2.json                   |   25 +-
 .../filtered-expected3.json                   |   25 +-
 .../data/common/manifests-expected.json       |  396 ++-
 .../data/common/manifests-expected.jsonlines  |   40 +-
 ...tional_license_combined_test.expected.json |  125 +-
 ...ional_license_directory_test.expected.json |   50 +-
 ...ditional_license_plugin_test.expected.json |   25 +-
 ...e-reference-works-with-clues.expected.json |  743 +++--
 ...-matched-text-with-reference.expected.json |  118 +-
 .../scan-with-reference.expected.json         |  112 +-
 .../data/match_spdx/scan-expected.json        |   28 +-
 .../unknown-license-expected.json             |   25 +-
 .../unknown-license-text-expected.json        |   28 +-
 .../clues/woodstox.expected.json              |   71 +-
 .../license-expression/scan.expected.json     |   50 +-
 .../spdx-expressions.expected.json            |   56 +-
 .../license-ref-see-copying.expected.json     |   84 +-
 .../license_reference/scan-ref.expected.json  |   84 +-
 ...-unknown-reference-copyright.expected.json |  170 +-
 .../license_reference/scan-wref.expected.json |   28 +-
 ...unknown-ref-to-key-file-root.expected.json |  443 +--
 .../license_url/license_url.expected.json     |   25 +-
 .../package/package.expected.json             |   62 +-
 .../scan/e2fsprogs-expected.json              |   37 +-
 .../scan/ffmpeg-license.expected.json         |  368 +-
 .../sqlite/sqlite.expected.json               | 2059 ++++++------
 .../text/scan-diag.expected.json              |   56 +-
 .../plugin_license/text/scan.expected.json    |   48 +-
 .../text_long_lines/scan-diag.expected.json   |   56 +-
 .../text_long_lines/scan.expected.json        |   56 +-
 ...n-unknown-intro-dual-license.expected.json |  112 +-
 ...tro-eclipse-foundation-tycho.expected.json |  398 ++-
 ...own-intro-eclipse-foundation.expected.json |   56 +-
 ...nown-intro-long-gaps-between.expected.json |  112 +-
 ...intro-with-imperfect-matches.expected.json |  112 +-
 .../file_with_multiple_licenses.expected.json |   50 +-
 .../policy-codebase.expected.json             |  125 +-
 .../plugin_license_text/scan.expected.json    |  157 +-
 tests/licensedcode/test_plugin_license.py     |    1 -
 .../many-podspecs-with-license-expected.json  |  291 +-
 ...cted-with-test-manifests-with-license.json |  172 +-
 ...ackage-instance-with-license-expected.json |  186 +-
 .../activemq-camel.expected.json              |   58 +-
 ...google-built-collection-diag.expected.json |  298 ++
 .../google-built-collection.expected.json     |   50 +-
 ...lection_without_license_text.expected.json |  286 ++
 .../jquery-form-3.51.0.expected.json          |  336 +-
 .../fizzler.expected.json                     |  260 +-
 .../flutter_playtabs_bridge.expected.json     |  224 +-
 .../nanopb.expected.json                      |  138 +-
 .../reference-to-package/base.expected.json   |  102 +-
 .../fusiondirectory.expected.json             | 2964 +++++++++--------
 .../google_appengine_sdk.expected.json        |  439 +--
 .../paddlenlp.expected.json                   |  463 +--
 .../physics.expected.json                     |  575 ++--
 .../reference-to-package/samba.expected.json  | 1435 ++++----
 ...ackson-dataformat-xml-2.13.5-expected.json |  159 +-
 .../johnzon-jsonb-1.2.11-expected.json        |  174 +-
 .../assemble/numbers-1.7.4-expected.json      |   62 +-
 ...htrace-core-4.0.0-incubating-expected.json |  283 +-
 ....4-pypi-package-with-license-expected.json |  455 ++-
 tests/packagedcode/test_license_detection.py  |   36 +-
 tests/scancode/data/info/all.expected.json    |   50 +-
 .../data/info/all.rooted.expected.json        |   50 +-
 .../scancode/data/license_text/test.expected  |   28 +-
 .../plugin_only_findings/basic.expected.json  |   50 +-
 .../component-package-build-expected.json     |  160 +-
 .../component-package-expected.json           |  160 +-
 .../license-holder-rollup-expected.json       |  124 +-
 ...iple-same-holder-and-license-expected.json |   74 +-
 ...t-counted-in-license-holders-expected.json |  122 +-
 .../package-fileset-expected.json             |   98 +-
 .../package-manifest-expected.json            |   62 +-
 ...rectory-with-minority-origin-expected.json |   61 +-
 ...return-nested-local-majority-expected.json |  148 +-
 .../data/score/basic-expected.json            |   99 +-
 ...consistent_licenses_copyleft-expected.json |  124 +-
 .../summarycode/data/score/jar-expected.json  |  173 +-
 .../score/no_license_ambiguity-expected.json  |  237 +-
 .../data/score/no_license_text-expected.json  |   62 +-
 ...nflicting_license_categories.expected.json |  175 +-
 .../summary/end-2-end/bug-1141.expected.json  |   50 +-
 .../holders/clear_holder.expected.json        |  148 +-
 .../holders/combined_holders.expected.json    |  148 +-
 .../license_ambiguity/ambiguous.expected.json |   50 +-
 .../unambiguous.expected.json                 |  100 +-
 .../multiple_package_data.expected.json       |  224 +-
 .../single_file/single_file.expected.json     |   25 +-
 .../summary-without-holder-pypi.expected.json |  383 ++-
 ...holder_from_package_resource.expected.json |   49 +-
 .../with_package_data.expected.json           |  162 +-
 .../without_package_data.expected.json        |  100 +-
 .../tallies/end-2-end/bug-1141.expected.json  |   50 +-
 .../full_tallies/tallies.expected.json        |  529 ++-
 .../tallies_by_facet.expected.json            |  529 ++-
 .../tallies_details.expected.json             |  529 ++-
 ...lies_key_files-details.expected.json-lines |   36 +-
 .../tallies_key_files.expected.json           |  492 ++-
 .../no_todo/base64-arraybuffer.expected.json  |   18 +-
 ...ti-orig-tarball-package-expected-diag.json |   11 +-
 .../unknown-license-expected-diag.json        |   14 +-
 107 files changed, 11529 insertions(+), 10343 deletions(-)
 create mode 100644 tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json
 create mode 100644 tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json

diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py
index 92fb51675a0..23da63c5b71 100644
--- a/src/licensedcode/detection.py
+++ b/src/licensedcode/detection.py
@@ -606,6 +606,12 @@ class LicenseMatchFromResult(LicenseMatch):
             help='Text which was matched')
     )
 
+    matched_text_diagnostics = attr.ib(
+        default=None,
+        metadata=dict(
+            help='Text which was matched, with extra diagnostics information.')
+    )
+
     def score(self):
         return self.match_score
 
@@ -631,6 +637,7 @@ def from_dict(cls, license_match_mapping):
         """
         rule = Rule.from_match_data(license_match_mapping)
         matched_text = license_match_mapping.get("matched_text") or None
+        matched_text_diagnostics = license_match_mapping.get("matched_text_diagnostics") or None
 
         return cls(
             from_file=license_match_mapping["from_file"],
@@ -641,6 +648,7 @@ def from_dict(cls, license_match_mapping):
             match_coverage=license_match_mapping["match_coverage"],
             matcher=license_match_mapping["matcher"],
             text=matched_text,
+            matched_text_diagnostics=matched_text_diagnostics,
             rule=rule,
             qspan=None,
             ispan=None,
@@ -664,10 +672,6 @@ def to_dict(
         """
         Return a "result" scan data built from a LicenseMatch object.
         """
-        matched_text = None
-        if include_text:
-            matched_text = self.matched_text
-
         result = {}
 
         result['license_expression'] = self.rule.license_expression
@@ -689,8 +693,10 @@ def to_dict(
         if rule_details:
             result["rule_notes"] = self.rule.notes
             result["referenced_filenames"] = self.rule.referenced_filenames
-        if include_text:
-            result['matched_text'] = matched_text
+        if include_text and self.matched_text:
+            result['matched_text'] = self.matched_text
+        if license_text_diagnostics and self.matched_text_diagnostics:
+            result['matched_text_diagnostics'] = self.matched_text_diagnostics
         if rule_details:
             result["rule_text"] = self.rule.text
 
@@ -929,7 +935,11 @@ def get_unique_detections(cls, license_detections):
 
         return unique_license_detections
 
-    def to_dict(self, license_diagnostics):
+    def to_dict(self,
+        include_text=False,
+        license_text_diagnostics=False,
+        license_diagnostics=False,
+    ):
 
         def dict_fields(attr, value):
 
@@ -946,7 +956,10 @@ def dict_fields(attr, value):
 
         detection_mapping = attr.asdict(self, filter=dict_fields)
         detection_mapping["sample_matches"] = [
-            match.to_dict(include_text=True)
+            match.to_dict(
+                include_text=include_text,
+                license_text_diagnostics=license_text_diagnostics,
+            )
             for match in self.matches
         ]
         return detection_mapping
diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py
index a7e429984d7..afb0178a8ca 100644
--- a/src/licensedcode/match.py
+++ b/src/licensedcode/match.py
@@ -773,7 +773,7 @@ def to_dict(
         spdx_license_url=SPDX_LICENSE_URL,
         include_text=False,
         license_text_diagnostics=False,
-        whole_lines=True,
+        whole_lines=False,
         file_path=None,
     ):
         """
@@ -785,11 +785,11 @@ def to_dict(
         if include_text:
             if license_text_diagnostics:
                 matched_text_diagnostics = self.matched_text(whole_lines=False, highlight=True)
+
+            if whole_lines:
+                matched_text = self.matched_text(whole_lines=True, highlight=False)
             else:
-                if whole_lines:
-                    matched_text = self.matched_text(whole_lines=True, highlight=False)
-                else:
-                    matched_text = self.matched_text(whole_lines=False, highlight=False)
+                matched_text = self.matched_text(whole_lines=False, highlight=False)
 
         result = {}
 
@@ -808,8 +808,8 @@ def to_dict(
 
         if include_text:
             result['matched_text'] = matched_text
-            if license_text_diagnostics:
-               result['matched_text_diagnostics'] = matched_text_diagnostics
+        if license_text_diagnostics:
+            result['matched_text_diagnostics'] = matched_text_diagnostics
         return result
 
     def get_highlighted_text(self, trace=TRACE_HIGHLIGHTED_TEXT):
diff --git a/src/licensedcode/plugin_license.py b/src/licensedcode/plugin_license.py
index 7734abc060e..a2e3b0638d1 100644
--- a/src/licensedcode/plugin_license.py
+++ b/src/licensedcode/plugin_license.py
@@ -170,7 +170,7 @@ def get_scanner(
             unknown_licenses=unknown_licenses,
         )
 
-    def process_codebase(self, codebase, license_diagnostics, **kwargs):
+    def process_codebase(self, codebase, license_text=False, license_diagnostics=False, license_text_diagnostics=False, **kwargs):
         """
         Post-process ``codebase`` to follow referenced filenames to license
         matches in other files.
@@ -231,7 +231,11 @@ def process_codebase(self, codebase, license_diagnostics, **kwargs):
             )
 
         unsorted_license_detections = [
-            unique_detection.to_dict(license_diagnostics=license_diagnostics)
+            unique_detection.to_dict(
+                include_text=license_text,
+                license_diagnostics=license_diagnostics,
+                license_text_diagnostics=license_text_diagnostics,
+            )
             for unique_detection in unique_license_detections
         ]
         codebase.attributes.license_detections.extend(
diff --git a/src/packagedcode/plugin_package.py b/src/packagedcode/plugin_package.py
index 5ca2ee8654e..90a0a64dd53 100644
--- a/src/packagedcode/plugin_package.py
+++ b/src/packagedcode/plugin_package.py
@@ -185,7 +185,7 @@ def get_scanner(self, package=True, system_package=False, **kwargs):
             system=system_package,
         )
 
-    def process_codebase(self, codebase, strip_root=False, **kwargs):
+    def process_codebase(self, codebase, strip_root=False, license_text=False, license_diagnostics=False, license_text_diagnostics=False, **kwargs):
         """
         Populate the ``codebase`` top level ``packages`` and ``dependencies``
         with package and dependency instances, assembling parsed package data
diff --git a/src/summarycode/todo.py b/src/summarycode/todo.py
index 135b26e5c61..374e6db55da 100644
--- a/src/summarycode/todo.py
+++ b/src/summarycode/todo.py
@@ -100,6 +100,22 @@ def process_codebase(self, codebase, **kwargs):
         if hasattr(codebase.root, 'license_detections'):
             has_licenses = True
 
+            license_diagnostics = kwargs.get("license_diagnostics")
+            license_text = kwargs.get("license_text")
+            license_text_diagnostics = kwargs.get("license_text_diagnostics")
+            if not license_diagnostics or not license_text or not license_text_diagnostics:
+                usage_suggestion_message = (
+                    "The --review option, whe paired with --license option should be used with the folowing "
+                    "additional CLI options for maximum benifit: [`--license-text`, `--license-text-diagnostics`,"
+                    "--license-diagnostics`] as these show additional diagnostic information to help review the issues."
+                )
+                warnings.simplefilter('always', ToDoPluginUsageWarning)
+                warnings.warn(
+                    usage_suggestion_message,
+                    ToDoPluginUsageWarning,
+                    stacklevel=2,
+                )
+
         if not has_packages and not has_licenses:
             usage_suggestion_message = (
                 "The --review option should be used with atleast one of the license [`--license`], "
@@ -323,11 +339,13 @@ def dict_fields(attr, value):
             matches_with_details = []
             for license_match in detection_mapping["detection"]["matches"]:
                 license_match_obj = LicenseMatchFromResult.from_dict(license_match)
-                matches_with_details.append(license_match_obj.to_dict(
-                    include_text=True,
-                    license_text_diagnostics=True,
-                    rule_details=True,
-                ))
+                matches_with_details.append(
+                    license_match_obj.to_dict(
+                        include_text=True,
+                        license_text_diagnostics=True,
+                        rule_details=True,
+                    )
+                )
             detection_mapping["detection"]["matches"] = matches_with_details
 
         return detection_mapping
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
index 2fe57fecb11..38fae8be567 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 96.07,
+          "license_expression": "apache-1.1",
+          "license_expression_spdx": "Apache-1.1",
           "from_file": "LICENSE",
           "start_line": 7,
           "end_line": 70,
+          "matcher": "3-seq",
+          "score": 96.07,
           "matched_length": 367,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-1.1",
-          "license_expression_spdx": "Apache-1.1",
-          "rule_identifier": "apache-1.1_63.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-1.1_63.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
         }
       ]
     }
@@ -52,17 +51,17 @@
           "license_expression_spdx": "Apache-1.1",
           "matches": [
             {
-              "score": 96.07,
+              "license_expression": "apache-1.1",
+              "spdx_license_expression": "Apache-1.1",
+              "from_file": "LICENSE",
               "start_line": 7,
               "end_line": 70,
-              "from_file": "LICENSE",
+              "matcher": "3-seq",
+              "score": 96.07,
               "matched_length": 367,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-1.1",
-              "spdx_license_expression": "Apache-1.1",
-              "rule_identifier": "apache-1.1_63.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-1.1_63.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
             }
           ],
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
index 24678fabc16..cd899fe24e2 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "pygres-2.2",
+          "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
           "from_file": "LICENSE2",
           "start_line": 7,
           "end_line": 22,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 145,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "pygres-2.2",
-          "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
-          "rule_identifier": "pygres-2.2_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE",
-          "matched_text": null
+          "rule_identifier": "pygres-2.2_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
         }
       ]
     }
@@ -52,17 +51,17 @@
           "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "pygres-2.2",
+              "spdx_license_expression": "LicenseRef-scancode-pygres-2.2",
+              "from_file": "LICENSE2",
               "start_line": 7,
               "end_line": 22,
-              "from_file": "LICENSE2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 145,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "pygres-2.2",
-              "spdx_license_expression": "LicenseRef-scancode-pygres-2.2",
-              "rule_identifier": "pygres-2.2_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pygres-2.2_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
             }
           ],
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
index 4da66d4bd5d..62d33365103 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "pcre",
+          "license_expression_spdx": "LicenseRef-scancode-pcre",
           "from_file": "LICENSE3",
           "start_line": 1,
           "end_line": 47,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 303,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "pcre",
-          "license_expression_spdx": "LicenseRef-scancode-pcre",
-          "rule_identifier": "pcre.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE",
-          "matched_text": null
+          "rule_identifier": "pcre.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
         }
       ]
     }
@@ -52,17 +51,17 @@
           "license_expression_spdx": "LicenseRef-scancode-pcre",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "pcre",
+              "spdx_license_expression": "LicenseRef-scancode-pcre",
+              "from_file": "LICENSE3",
               "start_line": 1,
               "end_line": 47,
-              "from_file": "LICENSE3",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 303,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "pcre",
-              "spdx_license_expression": "LicenseRef-scancode-pcre",
-              "rule_identifier": "pcre.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "pcre.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
             }
           ],
diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json
index a91d319351c..1361b556098 100644
--- a/tests/formattedcode/data/common/manifests-expected.json
+++ b/tests/formattedcode/data/common/manifests-expected.json
@@ -32,32 +32,32 @@
           "license_expression_spdx": "CDDL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "manifests/maven/persistence-api-1.0.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cddl-1.0",
-              "spdx_license_expression": "CDDL-1.0",
-              "rule_identifier": "cddl-1.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cddl-1.0.RULE",
               "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"
             },
             {
-              "score": 100.0,
+              "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "manifests/maven/persistence-api-1.0.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cddl-1.0",
-              "spdx_license_expression": "CDDL-1.0",
-              "rule_identifier": "cddl-1.0_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cddl-1.0_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
               "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
             }
@@ -128,17 +128,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "manifests/npm-license-mapping/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "manifests/npm-license-mapping/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache-2.0"
             }
@@ -150,17 +150,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "manifests/npm-license-mapping/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "manifests/npm-license-mapping/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache 2.0"
             }
@@ -227,17 +227,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "manifests/npm-license-string/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "manifests/npm-license-string/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -485,19 +485,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -508,19 +507,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     },
@@ -531,34 +529,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 16.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 16.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_72.RULE",
           "rule_relevance": 16,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE",
-          "matched_text": null
+          "rule_identifier": "license-intro_72.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
         },
         {
-          "score": 82.35,
+          "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,
+          "matcher": "3-seq",
+          "score": 82.35,
           "matched_length": 14,
           "match_coverage": 82.35,
-          "matcher": "3-seq",
-          "license_expression": "cddl-1.0",
-          "license_expression_spdx": "CDDL-1.0",
-          "rule_identifier": "cddl-1.0_32.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE",
-          "matched_text": null
+          "rule_identifier": "cddl-1.0_32.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
         }
       ]
     },
@@ -569,34 +565,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 8,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cddl-1.0",
-          "license_expression_spdx": "CDDL-1.0",
-          "rule_identifier": "cddl-1.0.RULE",
           "rule_relevance": 100,
-          "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"
+          "rule_identifier": "cddl-1.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cddl-1.0",
-          "license_expression_spdx": "CDDL-1.0",
-          "rule_identifier": "cddl-1.0_4.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
-          "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
+          "rule_identifier": "cddl-1.0_4.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE"
         }
       ]
     },
@@ -607,19 +601,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "manifests/pypi/bluepyopt_setup.py",
           "start_line": 74,
           "end_line": 75,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
         }
       ]
     },
@@ -630,19 +623,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "manifests/pypi/bluepyopt_setup.py",
           "start_line": 9,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 106,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_276.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-3.0_276.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
         }
       ]
     },
@@ -653,19 +645,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "manifests/pypi/bluepyopt_setup.py",
           "start_line": 65,
           "end_line": 65,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_152.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-3.0_152.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
         }
       ]
     },
@@ -676,19 +667,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "manifests/pypi/bluepyopt_setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_29.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
-          "matched_text": "LGPLv3"
+          "rule_identifier": "lgpl-3.0_29.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE"
         }
       ]
     },
@@ -699,19 +689,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "manifests/npm-license-string/package.json",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -722,19 +711,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "manifests/npm-license-string/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     }
@@ -862,32 +850,32 @@
               "license_expression_spdx": "CDDL-1.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "cddl-1.0",
+                  "spdx_license_expression": "CDDL-1.0",
+                  "from_file": "manifests/maven/persistence-api-1.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/maven/persistence-api-1.0.pom",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "cddl-1.0",
-                  "spdx_license_expression": "CDDL-1.0",
-                  "rule_identifier": "cddl-1.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cddl-1.0.RULE",
                   "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"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "cddl-1.0",
+                  "spdx_license_expression": "CDDL-1.0",
+                  "from_file": "manifests/maven/persistence-api-1.0.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": "manifests/maven/persistence-api-1.0.pom",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "cddl-1.0",
-                  "spdx_license_expression": "CDDL-1.0",
-                  "rule_identifier": "cddl-1.0_4.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cddl-1.0_4.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
                   "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
                 }
@@ -924,31 +912,31 @@
           "license_expression_spdx": "CDDL-1.0",
           "matches": [
             {
-              "score": 16.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "start_line": 17,
               "end_line": 19,
-              "from_file": "manifests/maven/persistence-api-1.0.pom",
+              "matcher": "2-aho",
+              "score": 16.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_72.RULE",
               "rule_relevance": 16,
+              "rule_identifier": "license-intro_72.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
             },
             {
-              "score": 82.35,
+              "license_expression": "cddl-1.0",
+              "spdx_license_expression": "CDDL-1.0",
+              "from_file": "manifests/maven/persistence-api-1.0.pom",
               "start_line": 18,
               "end_line": 20,
-              "from_file": "manifests/maven/persistence-api-1.0.pom",
+              "matcher": "3-seq",
+              "score": 82.35,
               "matched_length": 14,
               "match_coverage": 82.35,
-              "matcher": "3-seq",
-              "license_expression": "cddl-1.0",
-              "spdx_license_expression": "CDDL-1.0",
-              "rule_identifier": "cddl-1.0_32.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cddl-1.0_32.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
             }
           ],
@@ -1061,17 +1049,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "manifests/npm-license-mapping/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/npm-license-mapping/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "Apache-2.0"
                 }
@@ -1083,17 +1071,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "manifests/npm-license-mapping/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/npm-license-mapping/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "Apache 2.0"
                 }
@@ -1229,17 +1217,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "manifests/npm-license-mapping/package.json",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "manifests/npm-license-mapping/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
@@ -1250,17 +1238,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "manifests/npm-license-mapping/package.json",
               "start_line": 20,
               "end_line": 20,
-              "from_file": "manifests/npm-license-mapping/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -1377,17 +1365,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "manifests/npm-license-string/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/npm-license-string/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1473,17 +1461,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "manifests/npm-license-string/package.json",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "manifests/npm-license-string/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -1604,17 +1592,17 @@
               "license_expression_spdx": "LGPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
+                  "from_file": "manifests/pypi/bluepyopt_setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/pypi/bluepyopt_setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-3.0",
-                  "spdx_license_expression": "LGPL-3.0-only",
-                  "rule_identifier": "lgpl-3.0_29.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0_29.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
                   "matched_text": "LGPLv3"
                 }
@@ -1626,17 +1614,17 @@
               "license_expression_spdx": "LGPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
+                  "from_file": "manifests/pypi/bluepyopt_setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "manifests/pypi/bluepyopt_setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 10,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-3.0",
-                  "spdx_license_expression": "LGPL-3.0-only",
-                  "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
                   "matched_text": "- 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)'"
                 }
@@ -1780,17 +1768,17 @@
           "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "manifests/pypi/bluepyopt_setup.py",
               "start_line": 9,
               "end_line": 20,
-              "from_file": "manifests/pypi/bluepyopt_setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 106,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "lgpl-3.0_276.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0_276.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
             }
           ],
@@ -1801,17 +1789,17 @@
           "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "manifests/pypi/bluepyopt_setup.py",
               "start_line": 65,
               "end_line": 65,
-              "from_file": "manifests/pypi/bluepyopt_setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "lgpl-3.0_152.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0_152.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
             }
           ],
@@ -1822,17 +1810,17 @@
           "license_expression_spdx": "LGPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "manifests/pypi/bluepyopt_setup.py",
               "start_line": 74,
               "end_line": 75,
-              "from_file": "manifests/pypi/bluepyopt_setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
             }
           ],
diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines
index e16bd1fc2ff..530a02dea8d 100644
--- a/tests/formattedcode/data/common/manifests-expected.jsonlines
+++ b/tests/formattedcode/data/common/manifests-expected.jsonlines
@@ -25,10 +25,6 @@
             "python_version": "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]"
           },
           "spdx_license_list_version": "3.22",
-          "additional_license_plugins": [
-            "/home/ayansinha/nexB/write_access/scancode-extra/venv/lib/python3.8/site-packages/licenses_to_install1",
-            "/home/ayansinha/nexB/write_access/scancode-extra/venv/lib/python3.8/site-packages/licenses_to_install2"
-          ],
           "files_count": 4
         }
       }
@@ -536,8 +532,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
           }
         ]
       },
@@ -559,8 +554,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "apache-2.0_65.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
           }
         ]
       },
@@ -582,8 +576,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 16,
             "rule_identifier": "license-intro_72.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_72.RULE"
           },
           {
             "license_expression": "cddl-1.0",
@@ -597,8 +590,7 @@
             "match_coverage": 82.35,
             "rule_relevance": 100,
             "rule_identifier": "cddl-1.0_32.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_32.RULE"
           }
         ]
       },
@@ -620,8 +612,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "cddl-1.0.RULE",
-            "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"
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE"
           },
           {
             "license_expression": "cddl-1.0",
@@ -635,8 +626,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "cddl-1.0_4.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE",
-            "matched_text": "  url: http://www.sun.com/cddl/cddl.html"
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0_4.RULE"
           }
         ]
       },
@@ -658,8 +648,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "pypi_gnu_lesser_general_public_license_v3.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_gnu_lesser_general_public_license_v3.RULE"
           }
         ]
       },
@@ -681,8 +670,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "lgpl-3.0_276.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_276.RULE"
           }
         ]
       },
@@ -704,8 +692,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "lgpl-3.0_152.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_152.RULE"
           }
         ]
       },
@@ -727,8 +714,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "lgpl-3.0_29.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
-            "matched_text": "LGPLv3"
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE"
           }
         ]
       },
@@ -750,8 +736,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "mit_30.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
           }
         ]
       },
@@ -773,8 +758,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
-            "rule_url": null,
-            "matched_text": "MIT"
+            "rule_url": null
           }
         ]
       }
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 db979292f3d..6929ca6f37a 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
@@ -7,79 +7,74 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "example-installed-1",
+          "license_expression_spdx": "scancode-example-installed1",
           "from_file": "additional_license_combined_test.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example-installed-1",
-          "license_expression_spdx": "scancode-example-installed1",
-          "rule_identifier": "example-installed-1.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example-installed-1.LICENSE",
+          "rule_url": null
         },
         {
-          "score": 100.0,
+          "license_expression": "example-installed-2",
+          "license_expression_spdx": "LicenseRef-scancode-example-installed2",
           "from_file": "additional_license_combined_test.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example-installed-2",
-          "license_expression_spdx": "LicenseRef-scancode-example-installed2",
-          "rule_identifier": "example-installed-2.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example-installed-2.LICENSE",
+          "rule_url": null
         },
         {
-          "score": 100.0,
+          "license_expression": "example1",
+          "license_expression_spdx": "scancode-example1",
           "from_file": "additional_license_combined_test.txt",
           "start_line": 5,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example1",
-          "license_expression_spdx": "scancode-example1",
-          "rule_identifier": "example1.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example1.LICENSE",
+          "rule_url": null
         },
         {
-          "score": 100.0,
+          "license_expression": "example2",
+          "license_expression_spdx": "scancode-example2",
           "from_file": "additional_license_combined_test.txt",
           "start_line": 5,
           "end_line": 9,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 69,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example2",
-          "license_expression_spdx": "scancode-example2",
-          "rule_identifier": "example2.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example2.LICENSE",
+          "rule_url": null
         },
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "additional_license_combined_test.txt",
           "start_line": 12,
           "end_line": 12,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     }
@@ -412,73 +407,73 @@
           "license_expression_spdx": "scancode-example-installed1 AND LicenseRef-scancode-example-installed2 AND scancode-example1 AND scancode-example2 AND Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "example-installed-1",
+              "spdx_license_expression": "scancode-example-installed1",
+              "from_file": "additional_license_combined_test.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "additional_license_combined_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example-installed-1",
-              "spdx_license_expression": "scancode-example-installed1",
-              "rule_identifier": "example-installed-1.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example-installed-1.LICENSE",
               "rule_url": null
             },
             {
-              "score": 100.0,
+              "license_expression": "example-installed-2",
+              "spdx_license_expression": "LicenseRef-scancode-example-installed2",
+              "from_file": "additional_license_combined_test.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "additional_license_combined_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example-installed-2",
-              "spdx_license_expression": "LicenseRef-scancode-example-installed2",
-              "rule_identifier": "example-installed-2.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example-installed-2.LICENSE",
               "rule_url": null
             },
             {
-              "score": 100.0,
+              "license_expression": "example1",
+              "spdx_license_expression": "scancode-example1",
+              "from_file": "additional_license_combined_test.txt",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "additional_license_combined_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example1",
-              "spdx_license_expression": "scancode-example1",
-              "rule_identifier": "example1.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example1.LICENSE",
               "rule_url": null
             },
             {
-              "score": 100.0,
+              "license_expression": "example2",
+              "spdx_license_expression": "scancode-example2",
+              "from_file": "additional_license_combined_test.txt",
               "start_line": 5,
               "end_line": 9,
-              "from_file": "additional_license_combined_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 69,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example2",
-              "spdx_license_expression": "scancode-example2",
-              "rule_identifier": "example2.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example2.LICENSE",
               "rule_url": null
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "additional_license_combined_test.txt",
               "start_line": 12,
               "end_line": 12,
-              "from_file": "additional_license_combined_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
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 b5544b71cdb..d6669c4dd88 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
@@ -7,34 +7,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "example1",
+          "license_expression_spdx": "scancode-example1",
           "from_file": "additional_license_directory_test.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example1",
-          "license_expression_spdx": "scancode-example1",
-          "rule_identifier": "example1.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example1.LICENSE",
+          "rule_url": null
         },
         {
-          "score": 100.0,
+          "license_expression": "example2",
+          "license_expression_spdx": "scancode-example2",
           "from_file": "additional_license_directory_test.txt",
           "start_line": 1,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 69,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "example2",
-          "license_expression_spdx": "scancode-example2",
-          "rule_identifier": "example2.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example2.LICENSE",
+          "rule_url": null
         }
       ]
     }
@@ -175,31 +173,31 @@
           "license_expression_spdx": "scancode-example1 AND scancode-example2",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "example1",
+              "spdx_license_expression": "scancode-example1",
+              "from_file": "additional_license_directory_test.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "additional_license_directory_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example1",
-              "spdx_license_expression": "scancode-example1",
-              "rule_identifier": "example1.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example1.LICENSE",
               "rule_url": null
             },
             {
-              "score": 100.0,
+              "license_expression": "example2",
+              "spdx_license_expression": "scancode-example2",
+              "from_file": "additional_license_directory_test.txt",
               "start_line": 1,
               "end_line": 5,
-              "from_file": "additional_license_directory_test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 69,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "example2",
-              "spdx_license_expression": "scancode-example2",
-              "rule_identifier": "example2.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example2.LICENSE",
               "rule_url": null
             }
           ],
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 e34365dbf0c..308da786975 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
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "example-installed-1",
+          "license_expression_spdx": "scancode-example-installed1",
           "from_file": "additional_license_plugin_test.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "example-installed-1",
-          "license_expression_spdx": "scancode-example-installed1",
-          "rule_identifier": "example-installed-1.LICENSE",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "example-installed-1.LICENSE",
+          "rule_url": null
         }
       ]
     }
@@ -100,17 +99,17 @@
           "license_expression_spdx": "scancode-example-installed1",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "example-installed-1",
+              "spdx_license_expression": "scancode-example-installed1",
+              "from_file": "additional_license_plugin_test.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "additional_license_plugin_test.txt",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "example-installed-1",
-              "spdx_license_expression": "scancode-example-installed1",
-              "rule_identifier": "example-installed-1.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "example-installed-1.LICENSE",
               "rule_url": null
             }
           ],
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 e1cbeb7b057..b4757f6629d 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
@@ -8,19 +8,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "python.LICENSE",
           "start_line": 397,
           "end_line": 419,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 213,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_943.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_943.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
+          "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
         }
       ]
     },
@@ -32,19 +33,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "python.LICENSE",
           "start_line": 369,
           "end_line": 391,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 213,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_19.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_19.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
+          "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
         }
       ]
     },
@@ -58,34 +60,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "python.LICENSE",
           "start_line": 274,
           "end_line": 274,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "license-intro_50.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-          "matched_text": "is licensed under the following terms:"
+          "matched_text": "This copy of Python includes a copy of bzip2, which is licensed under the following terms:",
+          "matched_text_diagnostics": "is licensed under the following terms:"
         },
         {
-          "score": 100.0,
+          "license_expression": "bzip2-libbzip-2010",
+          "license_expression_spdx": "bzip2-1.0.6",
           "from_file": "python.LICENSE",
           "start_line": 281,
           "end_line": 310,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 233,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bzip2-libbzip-2010",
-          "license_expression_spdx": "bzip2-1.0.6",
-          "rule_identifier": "bzip2-libbzip-2010.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "bzip2-libbzip-2010.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
         }
       ]
     },
@@ -97,19 +101,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "openssl",
+          "license_expression_spdx": "LicenseRef-scancode-openssl",
           "from_file": "python.LICENSE",
           "start_line": 440,
           "end_line": 487,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 332,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "openssl",
-          "license_expression_spdx": "LicenseRef-scancode-openssl",
-          "rule_identifier": "openssl_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "openssl_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com)."
+          "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com).",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com)."
         }
       ]
     },
@@ -123,49 +128,52 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "python.LICENSE",
           "start_line": 422,
           "end_line": 422,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "license-intro_50.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-          "matched_text": "is licensed under the following terms:"
+          "matched_text": "This copy of Python includes a copy of openssl, which is licensed under the following terms:",
+          "matched_text_diagnostics": "is licensed under the following terms:"
         },
         {
-          "score": 100.0,
+          "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "from_file": "python.LICENSE",
           "start_line": 428,
           "end_line": 432,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 56,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "openssl-ssleay",
-          "license_expression_spdx": "OpenSSL",
-          "rule_identifier": "openssl-ssleay_43.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "openssl-ssleay_43.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE",
-          "matched_text": "The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org."
+          "matched_text": "  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org.",
+          "matched_text_diagnostics": "The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org."
         },
         {
-          "score": 100.0,
+          "license_expression": "openssl-ssleay",
+          "license_expression_spdx": "OpenSSL",
           "from_file": "python.LICENSE",
           "start_line": 434,
           "end_line": 434,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "openssl-ssleay",
-          "license_expression_spdx": "OpenSSL",
-          "rule_identifier": "openssl-ssleay_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "openssl-ssleay_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE",
-          "matched_text": "OpenSSL License"
+          "matched_text": "  OpenSSL License",
+          "matched_text_diagnostics": "OpenSSL License"
         }
       ]
     },
@@ -177,124 +185,132 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "from_file": "python.LICENSE",
           "start_line": 62,
           "end_line": 62,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "other-copyleft",
-          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
-          "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
+          "rule_identifier": "other-copyleft_24.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-          "matched_text": "GPL-compatible"
+          "matched_text": "(1) GPL-compatible doesn't mean that we're distributing Python under",
+          "matched_text_diagnostics": "GPL-compatible"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "python.LICENSE",
           "start_line": 62,
           "end_line": 63,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_200.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_200.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_200.RULE",
-          "matched_text": "under\n    the GPL."
+          "matched_text": "(1) GPL-compatible doesn't mean that we're distributing Python under\n    the GPL.  All Python licenses, unlike the GPL, let you distribute",
+          "matched_text_diagnostics": "under\n    the GPL."
         },
         {
-          "score": 85.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "python.LICENSE",
           "start_line": 63,
           "end_line": 63,
+          "matcher": "2-aho",
+          "score": 85.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
+          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-          "matched_text": "the GPL,"
+          "matched_text": "    the GPL.  All Python licenses, unlike the GPL, let you distribute",
+          "matched_text_diagnostics": "the GPL,"
         },
         {
-          "score": 85.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "python.LICENSE",
           "start_line": 64,
           "end_line": 65,
+          "matcher": "2-aho",
+          "score": 85.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
+          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-          "matched_text": "The\n    GPL-"
+          "matched_text": "    a modified version without making your changes open source.  The\n    GPL-compatible licenses make it possible to combine Python with",
+          "matched_text_diagnostics": "The\n    GPL-"
         },
         {
-          "score": 80.0,
+          "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "from_file": "python.LICENSE",
           "start_line": 65,
           "end_line": 65,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "other-copyleft",
-          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
-          "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
+          "rule_identifier": "other-copyleft_24.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-          "matched_text": "GPL-compatible"
+          "matched_text": "    GPL-compatible licenses make it possible to combine Python with",
+          "matched_text_diagnostics": "GPL-compatible"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "python.LICENSE",
           "start_line": 66,
           "end_line": 66,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_194.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_194.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_194.RULE",
-          "matched_text": "released under the GPL;"
+          "matched_text": "    other software that is released under the GPL; the others don't.",
+          "matched_text_diagnostics": "released under the GPL;"
         },
         {
-          "score": 80.0,
+          "license_expression": "other-copyleft",
+          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
           "from_file": "python.LICENSE",
           "start_line": 68,
           "end_line": 68,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "other-copyleft",
-          "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
-          "rule_identifier": "other-copyleft_24.RULE",
           "rule_relevance": 80,
+          "rule_identifier": "other-copyleft_24.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-          "matched_text": "GPL-compatible,"
+          "matched_text": "(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,",
+          "matched_text_diagnostics": "GPL-compatible,"
         },
         {
-          "score": 85.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "python.LICENSE",
           "start_line": 71,
           "end_line": 71,
+          "matcher": "2-aho",
+          "score": 85.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_relevance": 85,
+          "rule_identifier": "gpl-1.0-plus_351.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-          "matched_text": "the GPL."
+          "matched_text": "    is \"not incompatible\" with the GPL.",
+          "matched_text_diagnostics": "the GPL."
         }
       ]
     },
@@ -306,19 +322,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "python",
+          "license_expression_spdx": "Python-2.0",
           "from_file": "python.LICENSE",
           "start_line": 23,
           "end_line": 26,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 35,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "python",
-          "license_expression_spdx": "Python-2.0",
-          "rule_identifier": "python_not_not-a-license_269.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "python_not_not-a-license_269.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_not_not-a-license_269.RULE",
-          "matched_text": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases."
+          "matched_text": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases.",
+          "matched_text_diagnostics": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases."
         }
       ]
     },
@@ -330,34 +347,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 90.52,
+          "license_expression": "python",
+          "license_expression_spdx": "Python-2.0",
           "from_file": "python.LICENSE",
           "start_line": 77,
           "end_line": 255,
+          "matcher": "3-seq",
+          "score": 90.52,
           "matched_length": 1385,
           "match_coverage": 90.52,
-          "matcher": "3-seq",
-          "license_expression": "python",
-          "license_expression_spdx": "Python-2.0",
-          "rule_identifier": "python_2019.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "python_2019.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_2019.RULE",
-          "matched_text": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n[2001], [2002], [2003], [2004], [2005], [2006], [2007], [2008] Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved."
+          "matched_text": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved.",
+          "matched_text_diagnostics": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n[2001], [2002], [2003], [2004], [2005], [2006], [2007], [2008] Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved."
         },
         {
-          "score": 100.0,
+          "license_expression": "python-cwi",
+          "license_expression_spdx": "LicenseRef-scancode-python-cwi",
           "from_file": "python.LICENSE",
           "start_line": 257,
           "end_line": 272,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 145,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "python-cwi",
-          "license_expression_spdx": "LicenseRef-scancode-python-cwi",
-          "rule_identifier": "python-cwi.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "python-cwi.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/python-cwi.LICENSE",
-          "matched_text": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
+          "matched_text": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.",
+          "matched_text_diagnostics": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
         }
       ]
     },
@@ -371,34 +390,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "python.LICENSE",
           "start_line": 317,
           "end_line": 317,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "license-intro_50.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-          "matched_text": "is licensed under the following terms:"
+          "matched_text": "This copy of Python includes a copy of db, which is licensed under the following terms:",
+          "matched_text_diagnostics": "is licensed under the following terms:"
         },
         {
-          "score": 100.0,
+          "license_expression": "sleepycat",
+          "license_expression_spdx": "Sleepycat",
           "from_file": "python.LICENSE",
           "start_line": 334,
           "end_line": 351,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 174,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "sleepycat",
-          "license_expression_spdx": "Sleepycat",
-          "rule_identifier": "sleepycat_5.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "sleepycat_5.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_5.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs."
+          "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs."
         }
       ]
     },
@@ -410,19 +431,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "ssleay-windows",
+          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
           "from_file": "python.LICENSE",
           "start_line": 497,
           "end_line": 548,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 453,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "ssleay-windows",
-          "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
-          "rule_identifier": "ssleay-windows.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "ssleay-windows.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE",
-          "matched_text": "This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]"
+          "matched_text": " * This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]",
+          "matched_text_diagnostics": "This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]"
         }
       ]
     },
@@ -436,34 +458,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "python.LICENSE",
           "start_line": 595,
           "end_line": 595,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "license-intro_50.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-          "matched_text": "is licensed under the following terms:"
+          "matched_text": "This copy of Python includes a copy of tk, which is licensed under the following terms:",
+          "matched_text_diagnostics": "is licensed under the following terms:"
         },
         {
-          "score": 100.0,
+          "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "from_file": "python.LICENSE",
           "start_line": 597,
           "end_line": 635,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 341,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "tcl",
-          "license_expression_spdx": "TCL",
-          "rule_identifier": "tcl_14.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "tcl_14.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE",
-          "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
+          "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license.",
+          "matched_text_diagnostics": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
         }
       ]
     },
@@ -477,34 +501,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "python.LICENSE",
           "start_line": 552,
           "end_line": 552,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_50.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "license-intro_50.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-          "matched_text": "is licensed under the following terms:"
+          "matched_text": "This copy of Python includes a copy of tcl, which is licensed under the following terms:",
+          "matched_text_diagnostics": "is licensed under the following terms:"
         },
         {
-          "score": 100.0,
+          "license_expression": "tcl",
+          "license_expression_spdx": "TCL",
           "from_file": "python.LICENSE",
           "start_line": 554,
           "end_line": 593,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 345,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "tcl",
-          "license_expression_spdx": "TCL",
-          "rule_identifier": "tcl.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "tcl.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tcl.LICENSE",
-          "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
+          "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license.",
+          "matched_text_diagnostics": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
         }
       ]
     }
@@ -1619,19 +1645,20 @@
           "license_expression_spdx": "Python-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "python",
+              "spdx_license_expression": "Python-2.0",
+              "from_file": "python.LICENSE",
               "start_line": 23,
               "end_line": 26,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 35,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "python",
-              "spdx_license_expression": "Python-2.0",
-              "rule_identifier": "python_not_not-a-license_269.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "python_not_not-a-license_269.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_not_not-a-license_269.RULE",
-              "matched_text": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases."
+              "matched_text": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases.",
+              "matched_text_diagnostics": "All Python releases are Open Source (see http://www.opensource.org for\nthe Open Source Definition).  Historically, most, but not all, Python\nreleases have also been GPL-compatible; the table below summarizes\nthe various releases."
             }
           ],
           "detection_log": [],
@@ -1642,124 +1669,132 @@
           "license_expression_spdx": "LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
+              "from_file": "python.LICENSE",
               "start_line": 62,
               "end_line": 62,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "other-copyleft",
-              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
-              "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "other-copyleft_24.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-              "matched_text": "GPL-compatible"
+              "matched_text": "(1) GPL-compatible doesn't mean that we're distributing Python under",
+              "matched_text_diagnostics": "GPL-compatible"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "python.LICENSE",
               "start_line": 62,
               "end_line": 63,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_200.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_200.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_200.RULE",
-              "matched_text": "under\n    the GPL."
+              "matched_text": "(1) GPL-compatible doesn't mean that we're distributing Python under\n    the GPL.  All Python licenses, unlike the GPL, let you distribute",
+              "matched_text_diagnostics": "under\n    the GPL."
             },
             {
-              "score": 85.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "python.LICENSE",
               "start_line": 63,
               "end_line": 63,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 85.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
+              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-              "matched_text": "the GPL,"
+              "matched_text": "    the GPL.  All Python licenses, unlike the GPL, let you distribute",
+              "matched_text_diagnostics": "the GPL,"
             },
             {
-              "score": 85.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "python.LICENSE",
               "start_line": 64,
               "end_line": 65,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 85.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
+              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-              "matched_text": "The\n    GPL-"
+              "matched_text": "    a modified version without making your changes open source.  The\n    GPL-compatible licenses make it possible to combine Python with",
+              "matched_text_diagnostics": "The\n    GPL-"
             },
             {
-              "score": 80.0,
+              "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
+              "from_file": "python.LICENSE",
               "start_line": 65,
               "end_line": 65,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "other-copyleft",
-              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
-              "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "other-copyleft_24.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-              "matched_text": "GPL-compatible"
+              "matched_text": "    GPL-compatible licenses make it possible to combine Python with",
+              "matched_text_diagnostics": "GPL-compatible"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "python.LICENSE",
               "start_line": 66,
               "end_line": 66,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_194.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_194.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_194.RULE",
-              "matched_text": "released under the GPL;"
+              "matched_text": "    other software that is released under the GPL; the others don't.",
+              "matched_text_diagnostics": "released under the GPL;"
             },
             {
-              "score": 80.0,
+              "license_expression": "other-copyleft",
+              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
+              "from_file": "python.LICENSE",
               "start_line": 68,
               "end_line": 68,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "other-copyleft",
-              "spdx_license_expression": "LicenseRef-scancode-other-copyleft",
-              "rule_identifier": "other-copyleft_24.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "other-copyleft_24.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-copyleft_24.RULE",
-              "matched_text": "GPL-compatible,"
+              "matched_text": "(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,",
+              "matched_text_diagnostics": "GPL-compatible,"
             },
             {
-              "score": 85.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "python.LICENSE",
               "start_line": 71,
               "end_line": 71,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 85.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_relevance": 85,
+              "rule_identifier": "gpl-1.0-plus_351.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_351.RULE",
-              "matched_text": "the GPL."
+              "matched_text": "    is \"not incompatible\" with the GPL.",
+              "matched_text_diagnostics": "the GPL."
             }
           ],
           "detection_log": [],
@@ -1770,34 +1805,36 @@
           "license_expression_spdx": "Python-2.0 AND LicenseRef-scancode-python-cwi",
           "matches": [
             {
-              "score": 90.52,
+              "license_expression": "python",
+              "spdx_license_expression": "Python-2.0",
+              "from_file": "python.LICENSE",
               "start_line": 77,
               "end_line": 255,
-              "from_file": "python.LICENSE",
+              "matcher": "3-seq",
+              "score": 90.52,
               "matched_length": 1385,
               "match_coverage": 90.52,
-              "matcher": "3-seq",
-              "license_expression": "python",
-              "spdx_license_expression": "Python-2.0",
-              "rule_identifier": "python_2019.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "python_2019.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/python_2019.RULE",
-              "matched_text": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n[2001], [2002], [2003], [2004], [2005], [2006], [2007], [2008] Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved."
+              "matched_text": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved.",
+              "matched_text_diagnostics": "B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\n===============================================================\n\nPYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\n--------------------------------------------\n\n1. This LICENSE AGREEMENT is between the Python Software Foundation\n(\"PSF\"), and the Individual or Organization (\"Licensee\") accessing and\notherwise using this software (\"Python\") in source or binary form and\nits associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, PSF\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python\nalone or in any derivative version, provided, however, that PSF's\nLicense Agreement and PSF's notice of copyright, i.e., \"Copyright (c)\n[2001], [2002], [2003], [2004], [2005], [2006], [2007], [2008] Python Software Foundation; \nAll Rights Reserved\" are retained in Python alone or in any derivative \nversion prepared by Licensee.\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python.\n\n4. PSF is making Python available to Licensee on an \"AS IS\"\nbasis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\nFOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. Nothing in this License Agreement shall be deemed to create any\nrelationship of agency, partnership, or joint venture between PSF and\nLicensee.  This License Agreement does not grant permission to use PSF\ntrademarks or trade name in a trademark sense to endorse or promote\nproducts or services of Licensee, or any third party.\n\n8. By copying, installing or otherwise using Python, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nBEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\n-------------------------------------------\n\nBEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\n\n1. This LICENSE AGREEMENT is between BeOpen.com (\"BeOpen\"), having an\noffice at 160 Saratoga Avenue, Santa Clara, CA 95051, and the\nIndividual or Organization (\"Licensee\") accessing and otherwise using\nthis software in source or binary form and its associated\ndocumentation (\"the Software\").\n\n2. Subject to the terms and conditions of this BeOpen Python License\nAgreement, BeOpen hereby grants Licensee a non-exclusive,\nroyalty-free, world-wide license to reproduce, analyze, test, perform\nand/or display publicly, prepare derivative works, distribute, and\notherwise use the Software alone or in any derivative version,\nprovided, however, that the BeOpen Python License is retained in the\nSoftware, alone or in any derivative version prepared by Licensee.\n\n3. BeOpen is making the Software available to Licensee on an \"AS IS\"\nbasis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE\nSOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS\nAS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY\nDERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n5. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n6. This License Agreement shall be governed by and interpreted in all\nrespects by the law of the State of California, excluding conflict of\nlaw provisions.  Nothing in this License Agreement shall be deemed to\ncreate any relationship of agency, partnership, or joint venture\nbetween BeOpen and Licensee.  This License Agreement does not grant\npermission to use BeOpen trademarks or trade names in a trademark\nsense to endorse or promote products or services of Licensee, or any\nthird party.  As an exception, the \"BeOpen Python\" logos available at\nhttp://www.pythonlabs.com/logos.html may be used according to the\npermissions granted on that web page.\n\n7. By copying, installing or otherwise using the software, Licensee\nagrees to be bound by the terms and conditions of this License\nAgreement.\n\n\nCNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\n---------------------------------------\n\n1. This LICENSE AGREEMENT is between the Corporation for National\nResearch Initiatives, having an office at 1895 Preston White Drive,\nReston, VA 20191 (\"CNRI\"), and the Individual or Organization\n(\"Licensee\") accessing and otherwise using Python 1.6.1 software in\nsource or binary form and its associated documentation.\n\n2. Subject to the terms and conditions of this License Agreement, CNRI\nhereby grants Licensee a nonexclusive, royalty-free, world-wide\nlicense to reproduce, analyze, test, perform and/or display publicly,\nprepare derivative works, distribute, and otherwise use Python 1.6.1\nalone or in any derivative version, provided, however, that CNRI's\nLicense Agreement and CNRI's notice of copyright, i.e., \"Copyright (c)\n1995-2001 Corporation for National Research Initiatives; All Rights\nReserved\" are retained in Python 1.6.1 alone or in any derivative\nversion prepared by Licensee.  Alternately, in lieu of CNRI's License\nAgreement, Licensee may substitute the following text (omitting the\nquotes): \"Python 1.6.1 is made available subject to the terms and\nconditions in CNRI's License Agreement.  This Agreement together with\nPython 1.6.1 may be located on the Internet using the following\nunique, persistent identifier (known as a handle): 1895.22/1013.  This\nAgreement may also be obtained from a proxy server on the Internet\nusing the following URL: http://hdl.handle.net/1895.22/1013\".\n\n3. In the event Licensee prepares a derivative work that is based on\nor incorporates Python 1.6.1 or any part thereof, and wants to make\nthe derivative work available to others as provided herein, then\nLicensee hereby agrees to include in any such work a brief summary of\nthe changes made to Python 1.6.1.\n\n4. CNRI is making Python 1.6.1 available to Licensee on an \"AS IS\"\nbasis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR\nIMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND\nDISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS\nFOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT\nINFRINGE ANY THIRD PARTY RIGHTS.\n\n5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON\n1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS\nA RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,\nOR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.\n\n6. This License Agreement will automatically terminate upon a material\nbreach of its terms and conditions.\n\n7. This License Agreement shall be governed by the federal\nintellectual property law of the United States, including without\nlimitation the federal copyright law, and, to the extent such\nU.S. federal law does not apply, by the law of the Commonwealth of\nVirginia, excluding Virginia's conflict of law provisions.\nNotwithstanding the foregoing, with regard to derivative works based\non Python 1.6.1 that incorporate non-separable material that was\npreviously distributed under the GNU General Public License (GPL), the\nlaw of the Commonwealth of Virginia shall govern this License\nAgreement only as to issues arising under or with respect to\nParagraphs 4, 5, and 7 of this License Agreement.  Nothing in this\nLicense Agreement shall be deemed to create any relationship of\nagency, partnership, or joint venture between CNRI and Licensee.  This\nLicense Agreement does not grant permission to use CNRI trademarks or\ntrade name in a trademark sense to endorse or promote products or\nservices of Licensee, or any third party.\n\n8. By clicking on the \"ACCEPT\" button where indicated, or by copying,\ninstalling or otherwise using Python 1.6.1, Licensee agrees to be\nbound by the terms and conditions of this License Agreement.\n\n        ACCEPT\n\n\nCWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\n--------------------------------------------------\n\nCopyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,\nThe Netherlands.  All rights reserved."
             },
             {
-              "score": 100.0,
+              "license_expression": "python-cwi",
+              "spdx_license_expression": "LicenseRef-scancode-python-cwi",
+              "from_file": "python.LICENSE",
               "start_line": 257,
               "end_line": 272,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 145,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "python-cwi",
-              "spdx_license_expression": "LicenseRef-scancode-python-cwi",
-              "rule_identifier": "python-cwi.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "python-cwi.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/python-cwi.LICENSE",
-              "matched_text": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
+              "matched_text": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.",
+              "matched_text_diagnostics": "Permission to use, copy, modify, and distribute this software and its\ndocumentation for any purpose and without fee is hereby granted,\nprovided that the above copyright notice appear in all copies and that\nboth that copyright notice and this permission notice appear in\nsupporting documentation, and that the name of Stichting Mathematisch\nCentrum or CWI not be used in advertising or publicity pertaining to\ndistribution of the software without specific, written prior\npermission.\n\nSTICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO\nTHIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\nFITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE\nFOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\nWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\nACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT\nOF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE."
             }
           ],
           "detection_log": [],
@@ -1808,34 +1845,36 @@
           "license_expression_spdx": "bzip2-1.0.6",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "python.LICENSE",
               "start_line": 274,
               "end_line": 274,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "license-intro_50.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-              "matched_text": "is licensed under the following terms:"
+              "matched_text": "This copy of Python includes a copy of bzip2, which is licensed under the following terms:",
+              "matched_text_diagnostics": "is licensed under the following terms:"
             },
             {
-              "score": 100.0,
+              "license_expression": "bzip2-libbzip-2010",
+              "spdx_license_expression": "bzip2-1.0.6",
+              "from_file": "python.LICENSE",
               "start_line": 281,
               "end_line": 310,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 233,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bzip2-libbzip-2010",
-              "spdx_license_expression": "bzip2-1.0.6",
-              "rule_identifier": "bzip2-libbzip-2010.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "bzip2-libbzip-2010.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n\n2. The origin of this software must not be misrepresented; you must \n   not claim that you wrote the original software.  If you use this \n   software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n3. Altered source versions must be plainly marked as such, and must\n   not be misrepresented as being the original software.\n\n4. The name of the author may not be used to endorse or promote \n   products derived from this software without specific prior written \n   permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS\nOR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY\nDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE\nGOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\nWHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\nNEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             }
           ],
           "detection_log": [
@@ -1848,34 +1887,36 @@
           "license_expression_spdx": "Sleepycat",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "python.LICENSE",
               "start_line": 317,
               "end_line": 317,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "license-intro_50.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-              "matched_text": "is licensed under the following terms:"
+              "matched_text": "This copy of Python includes a copy of db, which is licensed under the following terms:",
+              "matched_text_diagnostics": "is licensed under the following terms:"
             },
             {
-              "score": 100.0,
+              "license_expression": "sleepycat",
+              "spdx_license_expression": "Sleepycat",
+              "from_file": "python.LICENSE",
               "start_line": 334,
               "end_line": 351,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 174,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "sleepycat",
-              "spdx_license_expression": "Sleepycat",
-              "rule_identifier": "sleepycat_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "sleepycat_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/sleepycat_5.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs."
+              "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Redistributions in any form must be accompanied by information on\n *    how to obtain complete source code for the DB software and any\n *    accompanying software that uses the DB software.  The source code\n *    must either be included in the distribution or be available for no\n *    more than the cost of distribution plus a nominal fee, and must be\n *    freely redistributable under reasonable conditions.  For an\n *    executable file, complete source code means the source code for all\n *    modules it contains.  It does not include source code for modules or\n *    files that typically accompany the major components of the operating\n *    system on which the executable file runs."
             }
           ],
           "detection_log": [
@@ -1888,19 +1929,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "python.LICENSE",
               "start_line": 369,
               "end_line": 391,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 213,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_19.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
+              "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
             }
           ],
           "detection_log": [],
@@ -1911,19 +1953,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "python.LICENSE",
               "start_line": 397,
               "end_line": 419,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 213,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_943.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_943.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_943.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
+              "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. Neither the name of the University nor the names of its contributors\n *    may be used to endorse or promote products derived from this software\n *    without specific prior written permission.\n *\n * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE."
             }
           ],
           "detection_log": [],
@@ -1934,49 +1977,52 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "python.LICENSE",
               "start_line": 422,
               "end_line": 422,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "license-intro_50.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-              "matched_text": "is licensed under the following terms:"
+              "matched_text": "This copy of Python includes a copy of openssl, which is licensed under the following terms:",
+              "matched_text_diagnostics": "is licensed under the following terms:"
             },
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "python.LICENSE",
               "start_line": 428,
               "end_line": 432,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 56,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "openssl-ssleay_43.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "openssl-ssleay_43.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_43.RULE",
-              "matched_text": "The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org."
+              "matched_text": "  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org.",
+              "matched_text_diagnostics": "The OpenSSL toolkit stays under a dual license, i.e. both the conditions of\n  the OpenSSL License and the original SSLeay license apply to the toolkit.\n  See below for the actual license texts. Actually both licenses are BSD-style\n  Open Source licenses. In case of any license issues related to OpenSSL\n  please contact openssl-core@openssl.org."
             },
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "python.LICENSE",
               "start_line": 434,
               "end_line": 434,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "openssl-ssleay_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "openssl-ssleay_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl-ssleay_2.RULE",
-              "matched_text": "OpenSSL License"
+              "matched_text": "  OpenSSL License",
+              "matched_text_diagnostics": "OpenSSL License"
             }
           ],
           "detection_log": [
@@ -1989,19 +2035,20 @@
           "license_expression_spdx": "LicenseRef-scancode-openssl",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl",
+              "spdx_license_expression": "LicenseRef-scancode-openssl",
+              "from_file": "python.LICENSE",
               "start_line": 440,
               "end_line": 487,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 332,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "openssl",
-              "spdx_license_expression": "LicenseRef-scancode-openssl",
-              "rule_identifier": "openssl_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "openssl_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/openssl_1.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com)."
+              "matched_text": " * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com).",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n *\n * 1. Redistributions of source code must retain the above copyright\n *    notice, this list of conditions and the following disclaimer. \n *\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in\n *    the documentation and/or other materials provided with the\n *    distribution.\n *\n * 3. All advertising materials mentioning features or use of this\n *    software must display the following acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n *\n * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n *    endorse or promote products derived from this software without\n *    prior written permission. For written permission, please contact\n *    openssl-core@openssl.org.\n *\n * 5. Products derived from this software may not be called \"OpenSSL\"\n *    nor may \"OpenSSL\" appear in their names without prior written\n *    permission of the OpenSSL Project.\n *\n * 6. Redistributions of any form whatsoever must retain the following\n *    acknowledgment:\n *    \"This product includes software developed by the OpenSSL Project\n *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n *\n * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n * OF THE POSSIBILITY OF SUCH DAMAGE.\n * ====================================================================\n *\n * This product includes cryptographic software written by Eric Young\n * (eay@cryptsoft.com).  This product includes software written by Tim\n * Hudson (tjh@cryptsoft.com)."
             }
           ],
           "detection_log": [],
@@ -2012,19 +2059,20 @@
           "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "ssleay-windows",
+              "spdx_license_expression": "LicenseRef-scancode-ssleay-windows",
+              "from_file": "python.LICENSE",
               "start_line": 497,
               "end_line": 548,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 453,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "ssleay-windows",
-              "spdx_license_expression": "LicenseRef-scancode-ssleay-windows",
-              "rule_identifier": "ssleay-windows.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "ssleay-windows.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ssleay-windows.LICENSE",
-              "matched_text": "This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]"
+              "matched_text": " * This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]",
+              "matched_text_diagnostics": "This package is an SSL implementation written\n * by Eric Young (eay@cryptsoft.com).\n * The implementation was written so as to conform with Netscapes SSL.\n * \n * This library is free for commercial and non-commercial use as long as\n * the following conditions are aheared to.  The following conditions\n * apply to all code found in this distribution, be it the RC4, RSA,\n * lhash, DES, etc., code; not just the SSL code.  The SSL documentation\n * included with this distribution is covered by the same copyright terms\n * except that the holder is Tim Hudson (tjh@cryptsoft.com).\n * \n * Copyright remains Eric Young's, and as such any Copyright notices in\n * the code are not to be removed.\n * If this package is used in a product, Eric Young should be given attribution\n * as the author of the parts of the library used.\n * This can be in the form of a textual message at program startup or\n * in documentation (online or textual) provided with the package.\n * \n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions\n * are met:\n * 1. Redistributions of source code must retain the copyright\n *    notice, this list of conditions and the following disclaimer.\n * 2. Redistributions in binary form must reproduce the above copyright\n *    notice, this list of conditions and the following disclaimer in the\n *    documentation and/or other materials provided with the distribution.\n * 3. All advertising materials mentioning features or use of this software\n *    must display the following acknowledgement:\n *    \"This product includes cryptographic software written by\n *     Eric Young (eay@cryptsoft.com)\"\n *    The word 'cryptographic' can be left out if the rouines from the library\n *    being used are not cryptographic related :-).\n * 4. If you include any Windows specific code (or a derivative thereof) from \n *    the apps directory (application code) you must include an acknowledgement:\n *    \"This product includes software written by Tim Hudson (tjh@cryptsoft.com)\"\n * \n * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND\n * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n * The licence and distribution terms for any publically available version or\n * derivative of this code cannot be changed.  i.e. this code cannot simply be\n * copied and put under another distribution licence\n * [including the GNU Public Licence.]"
             }
           ],
           "detection_log": [],
@@ -2035,34 +2083,36 @@
           "license_expression_spdx": "TCL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "python.LICENSE",
               "start_line": 552,
               "end_line": 552,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "license-intro_50.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-              "matched_text": "is licensed under the following terms:"
+              "matched_text": "This copy of Python includes a copy of tcl, which is licensed under the following terms:",
+              "matched_text_diagnostics": "is licensed under the following terms:"
             },
             {
-              "score": 100.0,
+              "license_expression": "tcl",
+              "spdx_license_expression": "TCL",
+              "from_file": "python.LICENSE",
               "start_line": 554,
               "end_line": 593,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 345,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "tcl",
-              "spdx_license_expression": "TCL",
-              "rule_identifier": "tcl.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "tcl.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/tcl.LICENSE",
-              "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
+              "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license.",
+              "matched_text_diagnostics": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., Scriptics Corporation, ActiveState\nCorporation and other parties.  The following terms apply to all files\nassociated with the software unless explicitly disclaimed in\nindividual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
             }
           ],
           "detection_log": [
@@ -2075,34 +2125,36 @@
           "license_expression_spdx": "TCL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "python.LICENSE",
               "start_line": 595,
               "end_line": 595,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_50.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "license-intro_50.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_50.RULE",
-              "matched_text": "is licensed under the following terms:"
+              "matched_text": "This copy of Python includes a copy of tk, which is licensed under the following terms:",
+              "matched_text_diagnostics": "is licensed under the following terms:"
             },
             {
-              "score": 100.0,
+              "license_expression": "tcl",
+              "spdx_license_expression": "TCL",
+              "from_file": "python.LICENSE",
               "start_line": 597,
               "end_line": 635,
-              "from_file": "python.LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 341,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "tcl",
-              "spdx_license_expression": "TCL",
-              "rule_identifier": "tcl_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "tcl_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/tcl_14.RULE",
-              "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
+              "matched_text": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license.",
+              "matched_text_diagnostics": "This software is copyrighted by the Regents of the University of\nCalifornia, Sun Microsystems, Inc., and other parties.  The following\nterms apply to all files associated with the software unless explicitly\ndisclaimed in individual files.\n\nThe authors hereby grant permission to use, copy, modify, distribute,\nand license this software and its documentation for any purpose, provided\nthat existing copyright notices are retained in all copies and that this\nnotice is included verbatim in any distributions. No written agreement,\nlicense, or royalty fee is required for any of the authorized uses.\nModifications to this software may be copyrighted by their authors\nand need not follow the licensing terms described here, provided that\nthe new terms are clearly indicated on the first page of each file where\nthey apply.\n\nIN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY\nFOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\nARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY\nDERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGE.\n\nTHE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE\nIS PROVIDED ON AN \"AS IS\" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE\nNO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR\nMODIFICATIONS.\n\nGOVERNMENT USE: If you are acquiring this software on behalf of the\nU.S. government, the Government shall have only \"Restricted Rights\"\nin the software and related documentation as defined in the Federal \nAcquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you\nare acquiring the software on behalf of the Department of Defense, the\nsoftware shall be classified as \"Commercial Computer Software\" and the\nGovernment shall have only \"Restricted Rights\" as defined in Clause\n252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the\nauthors grant the U.S. Government and others acting in its behalf\npermission to use and distribute the software in accordance with the\nterms specified in this license."
             }
           ],
           "detection_log": [
@@ -2113,19 +2165,20 @@
       ],
       "license_clues": [
         {
-          "score": 33.71,
+          "license_expression": "bsd-simplified",
+          "spdx_license_expression": "BSD-2-Clause",
+          "from_file": "python.LICENSE",
           "start_line": 358,
           "end_line": 363,
-          "from_file": "python.LICENSE",
+          "matcher": "3-seq",
+          "score": 33.71,
           "matched_length": 59,
           "match_coverage": 33.71,
-          "matcher": "3-seq",
-          "license_expression": "bsd-simplified",
-          "spdx_license_expression": "BSD-2-Clause",
-          "rule_identifier": "bsd-simplified_242.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-simplified_242.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_242.RULE",
-          "matched_text": "INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n * THE POSSIBILITY OF SUCH DAMAGE."
+          "matched_text": " * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n * THE POSSIBILITY OF SUCH DAMAGE.",
+          "matched_text_diagnostics": "INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n * THE POSSIBILITY OF SUCH DAMAGE."
         }
       ],
       "percentage_of_license_text": 83.64,
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 064873dd494..f2e54028063 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
@@ -45,17 +45,17 @@
           "license_expression_spdx": "Artistic-2.0 OR MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0 OR mit",
+              "spdx_license_expression": "Artistic-2.0 OR MIT",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "artistic-2.0 OR mit",
-              "spdx_license_expression": "Artistic-2.0 OR MIT",
-              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_url": null,
               "matched_text": "Artistic-2.0 OR MIT"
             }
@@ -93,34 +93,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "scan/copyr.java",
           "start_line": 3,
           "end_line": 16,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+          "matched_text": " * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.",
+          "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
         },
         {
-          "score": 100.0,
+          "license_expression": "mit OR bsd-simplified",
+          "license_expression_spdx": "MIT OR BSD-2-Clause",
           "from_file": "scan/copyr.java",
           "start_line": 19,
           "end_line": 19,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 8,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit OR bsd-simplified",
-          "license_expression_spdx": "MIT OR BSD-2-Clause",
-          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808",
           "rule_url": null,
-          "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause"
+          "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause",
+          "matched_text_diagnostics": "SPDX-License-Identifier: MIT or BSD-2-Clause"
         }
       ]
     },
@@ -132,19 +134,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 28,
           "end_line": 28,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": "license\": \"Artistic-2.0"
+          "matched_text": "  \"license\": \"Artistic-2.0 OR MIT\",",
+          "matched_text_diagnostics": "license\": \"Artistic-2.0"
         }
       ]
     },
@@ -156,17 +159,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "artistic-2.0 OR mit",
-          "license_expression_spdx": "Artistic-2.0 OR MIT",
-          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_url": null,
           "matched_text": "Artistic-2.0 OR MIT"
         }
@@ -495,34 +498,36 @@
           "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan/copyr.java",
               "start_line": 3,
               "end_line": 16,
-              "from_file": "scan/copyr.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+              "matched_text": " * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.",
+              "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
             },
             {
-              "score": 100.0,
+              "license_expression": "mit OR bsd-simplified",
+              "spdx_license_expression": "MIT OR BSD-2-Clause",
+              "from_file": "scan/copyr.java",
               "start_line": 19,
               "end_line": 19,
-              "from_file": "scan/copyr.java",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit OR bsd-simplified",
-              "spdx_license_expression": "MIT OR BSD-2-Clause",
-              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_url": null,
-              "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause"
+              "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause",
+              "matched_text_diagnostics": "SPDX-License-Identifier: MIT or BSD-2-Clause"
             }
           ],
           "detection_log": [],
@@ -582,17 +587,17 @@
               "license_expression_spdx": "Artistic-2.0 OR MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "artistic-2.0 OR mit",
+                  "spdx_license_expression": "Artistic-2.0 OR MIT",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "scan/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "artistic-2.0 OR mit",
-                  "spdx_license_expression": "Artistic-2.0 OR MIT",
-                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_url": null,
                   "matched_text": "Artistic-2.0 OR MIT"
                 }
@@ -627,19 +632,20 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 28,
               "end_line": 28,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-              "matched_text": "license\": \"Artistic-2.0"
+              "matched_text": "  \"license\": \"Artistic-2.0 OR MIT\",",
+              "matched_text_diagnostics": "license\": \"Artistic-2.0"
             }
           ],
           "detection_log": [],
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 1986a4fead1..42cf8c1fd3b 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
@@ -45,17 +45,17 @@
           "license_expression_spdx": "Artistic-2.0 OR MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0 OR mit",
+              "spdx_license_expression": "Artistic-2.0 OR MIT",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "artistic-2.0 OR mit",
-              "spdx_license_expression": "Artistic-2.0 OR MIT",
-              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_url": null,
               "matched_text": "Artistic-2.0 OR MIT"
             }
@@ -92,34 +92,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "scan/copyr.java",
           "start_line": 3,
           "end_line": 16,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit OR bsd-simplified",
+          "license_expression_spdx": "MIT OR BSD-2-Clause",
           "from_file": "scan/copyr.java",
           "start_line": 19,
           "end_line": 19,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 8,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit OR bsd-simplified",
-          "license_expression_spdx": "MIT OR BSD-2-Clause",
-          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
+          "rule_url": null
         }
       ]
     },
@@ -130,19 +128,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 28,
           "end_line": 28,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": null
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
         }
       ]
     },
@@ -153,19 +150,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "artistic-2.0 OR mit",
-          "license_expression_spdx": "Artistic-2.0 OR MIT",
-          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "Artistic-2.0 OR MIT"
+          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+          "rule_url": null
         }
       ]
     }
@@ -492,31 +488,31 @@
           "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan/copyr.java",
               "start_line": 3,
               "end_line": 16,
-              "from_file": "scan/copyr.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit OR bsd-simplified",
+              "spdx_license_expression": "MIT OR BSD-2-Clause",
+              "from_file": "scan/copyr.java",
               "start_line": 19,
               "end_line": 19,
-              "from_file": "scan/copyr.java",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit OR bsd-simplified",
-              "spdx_license_expression": "MIT OR BSD-2-Clause",
-              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
               "rule_url": null
             }
           ],
@@ -576,17 +572,17 @@
               "license_expression_spdx": "Artistic-2.0 OR MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "artistic-2.0 OR mit",
+                  "spdx_license_expression": "Artistic-2.0 OR MIT",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "scan/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "artistic-2.0 OR mit",
-                  "spdx_license_expression": "Artistic-2.0 OR MIT",
-                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_url": null,
                   "matched_text": "Artistic-2.0 OR MIT"
                 }
@@ -621,17 +617,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 28,
               "end_line": 28,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
             }
           ],
diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json
index 9b19afcf9ff..fc6bd3e7f7c 100644
--- a/tests/licensedcode/data/match_spdx/scan-expected.json
+++ b/tests/licensedcode/data/match_spdx/scan-expected.json
@@ -8,19 +8,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "license",
           "start_line": 240,
           "end_line": 240,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-158ab4758b53eeb6113d49d57f1d2a094ce67b5b",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-mit-88973101e25a62d0d9efdb31d23c1ace5fa0e07c",
           "rule_url": null,
-          "matched_text": "licenses.nuget.org/MIT\">MITMIT                ",
+          "matched_text_diagnostics": "licenses.nuget.org/MIT\">MITMITMIT                ",
+              "matched_text_diagnostics": "licenses.nuget.org/MIT\">MIT  *   */  /*"
+          "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*",
+          "matched_text_diagnostics": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
         }
       ]
     }
@@ -61,19 +63,20 @@
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 13,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_url": null,
-              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+              "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
@@ -95,19 +98,20 @@
           "license_expression_spdx": "Unlicense",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unlicense",
+              "spdx_license_expression": "Unlicense",
+              "from_file": "scan/tocbot.js",
               "start_line": 89,
               "end_line": 89,
-              "from_file": "scan/tocbot.js",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 198,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unlicense",
-              "spdx_license_expression": "Unlicense",
-              "rule_identifier": "unlicense.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "unlicense.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
-              "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
+              "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*",
+              "matched_text_diagnostics": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
             }
           ],
           "detection_log": [],
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 005c4085c78..345efce5853 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
@@ -8,19 +8,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl 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,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 13,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
-          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
-          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+          "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
         }
       ]
     },
@@ -32,19 +33,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "unlicense",
+          "license_expression_spdx": "Unlicense",
           "from_file": "scan/tocbot.js",
           "start_line": 89,
           "end_line": 89,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 198,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unlicense",
-          "license_expression_spdx": "Unlicense",
-          "rule_identifier": "unlicense.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "unlicense.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
-          "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
+          "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*",
+          "matched_text_diagnostics": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
         }
       ]
     }
@@ -61,19 +63,20 @@
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 13,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_url": null,
-              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+              "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
@@ -95,19 +98,20 @@
           "license_expression_spdx": "Unlicense",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unlicense",
+              "spdx_license_expression": "Unlicense",
+              "from_file": "scan/tocbot.js",
               "start_line": 89,
               "end_line": 89,
-              "from_file": "scan/tocbot.js",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 198,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unlicense",
-              "spdx_license_expression": "Unlicense",
-              "rule_identifier": "unlicense.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "unlicense.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unlicense.LICENSE",
-              "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
+              "matched_text": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*",
+              "matched_text_diagnostics": "This is free and unencumbered software released into the public domain.  *   * Anyone is free to copy, modify, publish, use, compile, sell, or  * distribute this software, either in source code form or as a compiled  * binary, for any purpose, commercial or non-commercial, and by any  * means.  *   * In jurisdictions that recognize copyright laws, the author or authors  * of this software dedicate any and all copyright interest in the  * software to the public domain. We make this dedication for the benefit  * of the public at large and to the detriment of our heirs and  * successors. We intend this dedication to be an overt act of  * relinquishment in perpetuity of all present and future rights to this  * software under copyright law.  *   * THE SOFTWARE IS PROVIDED \\\"\nAS IS\\\", WITHOUT WARRANTY OF ANY KIND,  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  * OTHER DEALINGS IN THE SOFTWARE.  *   * For more information, please refer to   *   */  /*"
             }
           ],
           "detection_log": [],
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 6ddc235aeb4..053eb6c9d33 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
@@ -10,64 +10,68 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "lead-in_unknown_30.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lead-in_unknown_30.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
-          "matched_text": "dual-licensed under [`"
+          "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+          "matched_text_diagnostics": "dual-licensed under [`"
         },
         {
-          "score": 50.0,
+          "license_expression": "wtfpl-2.0",
+          "license_expression_spdx": "WTFPL",
           "from_file": "scan-unknown-intro-dual-license/README.md",
           "start_line": 43,
           "end_line": 43,
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "wtfpl-2.0",
-          "license_expression_spdx": "WTFPL",
-          "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
           "rule_relevance": 50,
+          "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
-          "matched_text": "WTFPL`]("
+          "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+          "matched_text_diagnostics": "WTFPL`]("
         },
         {
-          "score": 100.0,
+          "license_expression": "wtfpl-2.0",
+          "license_expression_spdx": "WTFPL",
           "from_file": "scan-unknown-intro-dual-license/README.md",
           "start_line": 43,
           "end_line": 43,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "wtfpl-2.0",
-          "license_expression_spdx": "WTFPL",
-          "rule_identifier": "wtfpl-2.0_27.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "wtfpl-2.0_27.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
-          "matched_text": "www.wtfpl.net/"
+          "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+          "matched_text_diagnostics": "www.wtfpl.net/"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "scan-unknown-intro-dual-license/README.md",
           "start_line": 43,
           "end_line": 43,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_64.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_64.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
-          "matched_text": "MIT`](https://opensource.org/licenses/MIT)."
+          "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+          "matched_text_diagnostics": "MIT`](https://opensource.org/licenses/MIT)."
         }
       ]
     }
@@ -84,64 +88,68 @@
           "license_expression_spdx": "WTFPL AND MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "scan-unknown-intro-dual-license/README.md",
               "start_line": 43,
               "end_line": 43,
-              "from_file": "scan-unknown-intro-dual-license/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "lead-in_unknown_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lead-in_unknown_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
-              "matched_text": "dual-licensed under [`"
+              "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+              "matched_text_diagnostics": "dual-licensed under [`"
             },
             {
-              "score": 50.0,
+              "license_expression": "wtfpl-2.0",
+              "spdx_license_expression": "WTFPL",
+              "from_file": "scan-unknown-intro-dual-license/README.md",
               "start_line": 43,
               "end_line": 43,
-              "from_file": "scan-unknown-intro-dual-license/README.md",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "wtfpl-2.0",
-              "spdx_license_expression": "WTFPL",
-              "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
-              "matched_text": "WTFPL`]("
+              "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+              "matched_text_diagnostics": "WTFPL`]("
             },
             {
-              "score": 100.0,
+              "license_expression": "wtfpl-2.0",
+              "spdx_license_expression": "WTFPL",
+              "from_file": "scan-unknown-intro-dual-license/README.md",
               "start_line": 43,
               "end_line": 43,
-              "from_file": "scan-unknown-intro-dual-license/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "wtfpl-2.0",
-              "spdx_license_expression": "WTFPL",
-              "rule_identifier": "wtfpl-2.0_27.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "wtfpl-2.0_27.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
-              "matched_text": "www.wtfpl.net/"
+              "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+              "matched_text_diagnostics": "www.wtfpl.net/"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "scan-unknown-intro-dual-license/README.md",
               "start_line": 43,
               "end_line": 43,
-              "from_file": "scan-unknown-intro-dual-license/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_64.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_64.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
-              "matched_text": "MIT`](https://opensource.org/licenses/MIT)."
+              "matched_text": "All code, unless stated otherwise, is dual-licensed under [`WTFPL`](http://www.wtfpl.net/txt/copying/) and [`MIT`](https://opensource.org/licenses/MIT).",
+              "matched_text_diagnostics": "MIT`](https://opensource.org/licenses/MIT)."
             }
           ],
           "detection_log": [
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 c33b25edbd1..1ee4d13d399 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
@@ -8,19 +8,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 51,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1208.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_1208.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1208.RULE",
-          "matched_text": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlYour use of the opentest4j code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.",
+          "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/).",
+          "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.Your use of the SureFire JUnit Runner code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.
",
+          "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.\n
\nBSD License"
+          "matched_text": "
The Hamcrest New BSD License:
\n
\nBSD License",
+          "matched_text_diagnostics": "New BSD License:
\n
\nBSD License"
         }
       ]
     },
@@ -119,19 +124,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html",
           "start_line": 64,
           "end_line": 85,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 211,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_860.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_860.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_860.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE."
+          "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE."
         }
       ]
     },
@@ -143,19 +149,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 60,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cpl-1.0",
-          "license_expression_spdx": "CPL-1.0",
-          "rule_identifier": "cpl-1.0_36.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "cpl-1.0_36.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cpl-1.0_36.RULE",
-          "matched_text": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found herehttps://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found here)
",
+          "matched_text_diagnostics": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found herehttps://www.eclipse.org/legal/cpl-v10.htmlhttps://www.eclipse.org/legal/cpl-v10.html.",
+          "matched_text_diagnostics": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.orgLicense
\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.org.
",
+          "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.org\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.orgLicense\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.org.
",
+          "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.orgLICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/Your use of the junit-jupiter-engine, junit-vintage-engine, junit-platform-commons, junit-platform-engine, junit-platform-launcher code is subject to the terms and conditions of the Eclipse Public License 2.0.  A copy of the license is contained\nin the file LICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/.",
+          "matched_text_diagnostics": "code is subject to the terms and conditions of the Eclipse Public License 2.0.  A copy of the license is contained\nin the file LICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.orgLicense\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.org.
",
+              "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.org\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/).",
+              "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.Your use of the SureFire JUnit Runner code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.
",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.orgLicense\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.org.
",
+              "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at http://www.eclipse.org\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/The plug-in includes Surefire Shared Java 5 Provider Base ${surefire-version} developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/).",
+              "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:
\n\n
\nThis product includes software developed by the Apache Software Foundation (http://www.apache.org/LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.Your use of the Surefire Shared Java 5 Provider Base code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.
",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.\n\n
The Apache attribution NOTICE file is included with the Content in accordance with 4d of the Apache License, Version 2.0.LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlYour use of the opentest4j code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlLICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlYour use of the API Guardian code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlLICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlYour use of the junit-platform-surefire-provider code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained\nin the file LICENSE and is also available at http://www.apache.org/licenses/LICENSE-2.0.htmlLICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/Your use of the junit-jupiter-engine, junit-vintage-engine, junit-platform-commons, junit-platform-engine, junit-platform-launcher code is subject to the terms and conditions of the Eclipse Public License 2.0.  A copy of the license is contained\nin the file LICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/.",
+              "matched_text_diagnostics": "code is subject to the terms and conditions of the Eclipse Public License 2.0.  A copy of the license is contained\nin the file LICENSE.md and is also available at https://www.eclipse.org/legal/epl-2.0/\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.orgLicense\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.org.
",
+              "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.orghttps://www.eclipse.org/legal/cpl-v10.htmlhttps://www.eclipse.org/legal/cpl-v10.html.",
+              "matched_text_diagnostics": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html\n
\nBSD License"
+              "matched_text": "
The Hamcrest New BSD License:
\n
\nBSD License",
+              "matched_text_diagnostics": "New BSD License:
\n
\nBSD License"
             }
           ],
           "detection_log": [],
@@ -604,19 +629,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html",
               "start_line": 64,
               "end_line": 85,
-              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 211,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_860.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_860.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_860.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE."
+              "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\nRedistributions of source code must retain the above copyright notice, this list of\nconditions and the following disclaimer. Redistributions in binary form must reproduce\nthe above copyright notice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the distribution.\n\nNeither the name of Hamcrest nor the names of its contributors may be used to endorse\nor promote products derived from this software without specific prior written\npermission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\nEXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\nSHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\nINCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\nTO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\nBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY\nWAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\nDAMAGE."
             }
           ],
           "detection_log": [],
@@ -638,19 +664,20 @@
           "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
+              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html",
               "start_line": 12,
               "end_line": 25,
-              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 163,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "epl-1.0",
-              "spdx_license_expression": "EPL-1.0",
-              "rule_identifier": "epl-1.0_104.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "epl-1.0_104.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_104.RULE",
-              "matched_text": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.orgLicense\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.org.
",
+              "matched_text_diagnostics": "License\n\n
The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise \nindicated below, the Content is provided to you under the terms and conditions of the\nEclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available \nat https://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.
\n\n
If you did not receive this Content directly from the Eclipse Foundation, the Content is \nbeing redistributed by another party ("Redistributor") and different terms and conditions may\napply to your use of any object code in the Content.  Check the Redistributor's license that was \nprovided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise\nindicated below, the terms and conditions of the EPL still apply to any source code in the Content\nand such source code may be obtained at https://www.eclipse.orghttps://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found herehttps://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found here)
",
+              "matched_text_diagnostics": "source and binary code form contained in the plug-in is subject to the terms and conditions of the \nCommon Public License Version 1.0 ("CPL").  A copy of the CPL is available at https://www.eclipse.org/legal/cpl-v10.html.\n(a local copy can be found here\n\n
MIT License\n\n
MIT License\n\n
MIT License\n\n
MIT License\n\n
MIT License\n\n
MIT License."
+          "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see .",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
         }
       ]
     },
@@ -32,19 +33,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "scan/copyr.java",
           "start_line": 18,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.",
+          "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
         }
       ]
     },
@@ -56,19 +58,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl 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,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 13,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
-          "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
-          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+          "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
         }
       ]
     },
@@ -80,19 +83,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "ja-sig",
+          "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "from_file": "scan/copyr.java",
           "start_line": 4,
           "end_line": 13,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 212,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "ja-sig",
-          "license_expression_spdx": "LicenseRef-scancode-ja-sig",
-          "rule_identifier": "ja-sig.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "ja-sig.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
+          "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
         }
       ]
     }
@@ -154,19 +158,20 @@
           "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
+              "from_file": "scan/apache-1.0.txt",
               "start_line": 8,
               "end_line": 58,
-              "from_file": "scan/apache-1.0.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 368,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-1.0",
-              "spdx_license_expression": "Apache-1.0",
-              "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-1.0.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
+              "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see .",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
             }
           ],
           "detection_log": [],
@@ -207,19 +212,20 @@
           "license_expression_spdx": "Apache-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-1.0",
+              "spdx_license_expression": "Apache-1.0",
+              "from_file": "scan/apache-with_extra.txt",
               "start_line": 40,
               "end_line": 90,
-              "from_file": "scan/apache-with_extra.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 368,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-1.0",
-              "spdx_license_expression": "Apache-1.0",
-              "rule_identifier": "apache-1.0.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-1.0.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
+              "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see .",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
             }
           ],
           "detection_log": [],
@@ -260,19 +266,20 @@
           "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "ja-sig",
+              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
+              "from_file": "scan/copyr.java",
               "start_line": 4,
               "end_line": 13,
-              "from_file": "scan/copyr.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 212,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "ja-sig",
-              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
-              "rule_identifier": "ja-sig.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "ja-sig.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
+              "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
             }
           ],
           "detection_log": [],
@@ -283,19 +290,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan/copyr.java",
               "start_line": 18,
               "end_line": 31,
-              "from_file": "scan/copyr.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.",
+              "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
             }
           ],
           "detection_log": [],
@@ -336,19 +344,20 @@
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 13,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
               "rule_url": null,
-              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+              "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
@@ -389,19 +398,20 @@
           "license_expression_spdx": "LicenseRef-scancode-ja-sig",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "ja-sig",
+              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
+              "from_file": "scan/this.java",
               "start_line": 4,
               "end_line": 13,
-              "from_file": "scan/this.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 212,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "ja-sig",
-              "spdx_license_expression": "LicenseRef-scancode-ja-sig",
-              "rule_identifier": "ja-sig.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "ja-sig.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/ja-sig.LICENSE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
+              "matched_text": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\n3. Redistributions of any form whatsoever must retain the following acknowledgment:\n\"This product includes software developed by the JA-SIG Collaborative (http://www.ja-sig.org/).\"\n\nThis software is provided by the JA-SIG collaborative \"as is\" and any expressed or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the JA-SIG collaborative or its contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability,\n whether in contract, strict liability, 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."
             }
           ],
           "detection_log": [],
@@ -412,19 +422,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan/this.java",
               "start_line": 18,
               "end_line": 31,
-              "from_file": "scan/this.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
+              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.",
+              "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements.  See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the \"License\"); you may not use this file except in compliance with\n * the License.  You may obtain a copy of the License at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License."
             }
           ],
           "detection_log": [],
diff --git a/tests/licensedcode/test_plugin_license.py b/tests/licensedcode/test_plugin_license.py
index 21d67143d30..5e3f3b56674 100644
--- a/tests/licensedcode/test_plugin_license.py
+++ b/tests/licensedcode/test_plugin_license.py
@@ -86,7 +86,6 @@ def test_license_option_reports_license_texts():
     args = [
         '--license',
         '--license-text',
-        '--license-text-diagnostics',
         '--license-diagnostics',
         '--strip-root',
         '--verbose',
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 053078ca666..47e696a0b52 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -117,17 +117,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/Amplify.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/Amplify.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -194,17 +194,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyPlugins.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AmplifyPlugins.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -271,17 +271,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -348,17 +348,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPluginsCore.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AWSPluginsCore.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -425,17 +425,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -585,19 +585,18 @@
       "detection_count": 6,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "many-podspecs/Amplify.podspec",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
-          "matched_text": "Apache License, Version 2.0"
+          "rule_identifier": "apache-2.0_48.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE"
         }
       ]
     },
@@ -608,19 +607,18 @@
       "detection_count": 6,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "many-podspecs/Amplify.podspec",
           "start_line": 21,
           "end_line": 21,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_68.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_68.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
         }
       ]
     },
@@ -631,19 +629,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "many-podspecs/amplify-ios.LICENSE",
           "start_line": 2,
           "end_line": 175,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1405,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_70.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_70.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
         }
       ]
     }
@@ -705,17 +702,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AWSPluginsCore.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/AWSPluginsCore.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -750,17 +747,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPluginsCore.podspec",
               "start_line": 25,
               "end_line": 25,
-              "from_file": "many-podspecs/AWSPluginsCore.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -815,17 +812,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -860,17 +857,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
               "start_line": 17,
               "end_line": 17,
-              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -925,17 +922,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/Amplify.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/Amplify.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -970,17 +967,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/Amplify.podspec",
               "start_line": 21,
               "end_line": 21,
-              "from_file": "many-podspecs/Amplify.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -1035,17 +1032,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AmplifyPlugins.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/AmplifyPlugins.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -1080,17 +1077,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyPlugins.podspec",
               "start_line": 24,
               "end_line": 24,
-              "from_file": "many-podspecs/AmplifyPlugins.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -1145,17 +1142,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AmplifyTestCommon.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/AmplifyTestCommon.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -1190,17 +1187,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
               "start_line": 24,
               "end_line": 24,
-              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -1255,17 +1252,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -1300,17 +1297,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
               "start_line": 14,
               "end_line": 14,
-              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_68.RULE"
             }
           ],
@@ -1357,17 +1354,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/amplify-ios.LICENSE",
                   "start_line": 2,
                   "end_line": 175,
-                  "from_file": "many-podspecs/amplify-ios.LICENSE",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1405,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_70.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_70.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
                 }
               ],
@@ -1436,17 +1433,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/amplify-ios.LICENSE",
                   "start_line": 2,
                   "end_line": 175,
-                  "from_file": "many-podspecs/amplify-ios.LICENSE",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1405,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_70.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_70.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
                 }
               ],
@@ -1573,17 +1570,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/amplify-ios.LICENSE",
               "start_line": 2,
               "end_line": 175,
-              "from_file": "many-podspecs/amplify-ios.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1405,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_70.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_70.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_70.RULE"
             }
           ],
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 8236a786e3f..7d43a239e0a 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
@@ -50,17 +50,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -99,19 +99,18 @@
       "detection_count": 4,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pypi-with-test-manifests/PKG-INFO",
           "start_line": 14,
           "end_line": 14,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
         }
       ]
     },
@@ -122,19 +121,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pypi-with-test-manifests/LICENSE",
           "start_line": 3,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -145,34 +143,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pypi-with-test-manifests/LICENSE",
           "start_line": 3,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -193,17 +189,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi-with-test-manifests/LICENSE",
               "start_line": 3,
               "end_line": 19,
-              "from_file": "pypi-with-test-manifests/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -282,17 +278,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi-with-test-manifests/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pypi-with-test-manifests/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -329,17 +325,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi-with-test-manifests/PKG-INFO",
               "start_line": 14,
               "end_line": 14,
-              "from_file": "pypi-with-test-manifests/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -350,31 +346,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pypi-with-test-manifests/PKG-INFO",
               "start_line": 26,
               "end_line": 26,
-              "from_file": "pypi-with-test-manifests/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi-with-test-manifests/LICENSE",
               "start_line": 3,
               "end_line": 19,
-              "from_file": "pypi-with-test-manifests/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -500,17 +496,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi-with-test-manifests/LICENSE",
                   "start_line": 3,
                   "end_line": 19,
-                  "from_file": "pypi-with-test-manifests/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
@@ -587,17 +583,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi-with-test-manifests/setup.cfg",
                   "start_line": 12,
                   "end_line": 12,
-                  "from_file": "pypi-with-test-manifests/setup.cfg",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
                 }
               ],
@@ -902,17 +898,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi-with-test-manifests/setup.cfg",
               "start_line": 12,
               "end_line": 12,
-              "from_file": "pypi-with-test-manifests/setup.cfg",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -959,17 +955,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi-with-test-manifests/LICENSE",
                   "start_line": 3,
                   "end_line": 19,
-                  "from_file": "pypi-with-test-manifests/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
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 fec80afc8e2..a5f0a8f6ca6 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
@@ -40,32 +40,32 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "setup.cfg",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.cfg",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_1305.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
               "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/LICENSE.rst",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "pypi/LICENSE.rst",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
             }
           ],
@@ -148,19 +148,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/LICENSE.rst",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
         }
       ]
     },
@@ -174,34 +173,32 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/setup.cfg",
           "start_line": 13,
           "end_line": 14,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 8,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_1302.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-new_1302.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE"
         },
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/LICENSE.rst",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
         }
       ]
     },
@@ -215,34 +212,32 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/setup.cfg",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_1305.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
-          "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
+          "rule_identifier": "bsd-new_1305.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE"
         },
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/LICENSE.rst",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_89.RULE",
           "rule_relevance": 99,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-new_89.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
         }
       ]
     },
@@ -254,19 +249,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "pypi/setup.cfg",
           "start_line": 25,
           "end_line": 25,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_bsd_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE"
         }
       ]
     }
@@ -287,17 +281,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/LICENSE.rst",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "pypi/LICENSE.rst",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
             }
           ],
@@ -367,32 +361,32 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/setup.cfg",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pypi/setup.cfg",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
                   "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
                 },
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/LICENSE.rst",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pypi/LICENSE.rst",
+                  "matcher": "2-aho",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
                 }
               ],
@@ -440,31 +434,31 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/setup.cfg",
               "start_line": 13,
               "end_line": 14,
-              "from_file": "pypi/setup.cfg",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_1302.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_1302.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1302.RULE"
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/LICENSE.rst",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "pypi/LICENSE.rst",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
             }
           ],
@@ -478,17 +472,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/setup.cfg",
               "start_line": 25,
               "end_line": 25,
-              "from_file": "pypi/setup.cfg",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE"
             }
           ],
@@ -536,17 +530,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/LICENSE.rst",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pypi/LICENSE.rst",
+                  "matcher": "2-aho",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE"
                 }
               ],
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 c387bbba371..7d6382ba015 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
@@ -32,19 +32,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "activemq-camel-pom.xml",
               "start_line": 3,
               "end_line": 16,
-              "from_file": "activemq-camel-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
+              "matched_text": "  Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.",
+              "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
             }
           ],
           "detection_log": [
@@ -242,19 +243,20 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
+          "matched_text": "  Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.",
+          "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
         }
       ]
     }
@@ -296,19 +298,20 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "activemq-camel/activemq-camel-pom.xml",
                   "start_line": 3,
                   "end_line": 16,
-                  "from_file": "activemq-camel/activemq-camel-pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 119,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-                  "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
+                  "matched_text": "  Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.",
+                  "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
                 }
               ],
               "detection_log": [
@@ -457,19 +460,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "activemq-camel/activemq-camel-pom.xml",
               "start_line": 3,
               "end_line": 16,
-              "from_file": "activemq-camel/activemq-camel-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-              "matched_text": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
+              "matched_text": "  Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License.",
+              "matched_text_diagnostics": "Licensed to the Apache Software Foundation (ASF) under one or more\n  contributor license agreements.  See the NOTICE file distributed with\n  this work for additional information regarding copyright ownership.\n  The ASF licenses this file to You under the Apache License, Version 2.0\n  (the \"License\"); you may not use this file except in compliance with\n  the License.  You may obtain a copy of the License at\n  \n  http://www.apache.org/licenses/LICENSE-2.0\n  \n  Unless required by applicable law or agreed to in writing, software\n  distributed under the License is distributed on an \"AS IS\" BASIS,\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n  See the License for the specific language governing permissions and\n  limitations under the License."
             }
           ],
           "detection_log": [
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
new file mode 100644
index 00000000000..d6658f3e2f0
--- /dev/null
+++ b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json
@@ -0,0 +1,298 @@
+{
+    "packages": [
+      {
+        "type": "dart",
+        "namespace": null,
+        "name": "built_collection",
+        "version": "5.1.1",
+        "qualifiers": {},
+        "subpath": null,
+        "primary_language": "dart",
+        "description": "Immutable collections based on the SDK collections. Each SDK collection class is split into a new immutable collection class and a corresponding mutable builder class.\n",
+        "release_date": null,
+        "parties": [],
+        "keywords": [],
+        "homepage_url": null,
+        "download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+        "size": null,
+        "sha1": null,
+        "md5": null,
+        "sha256": null,
+        "sha512": null,
+        "bug_tracking_url": null,
+        "code_view_url": null,
+        "vcs_url": "https://github.com/google/built_collection.dart",
+        "copyright": null,
+        "holder": null,
+        "declared_license_expression": "bsd-new",
+        "declared_license_expression_spdx": "BSD-3-Clause",
+        "license_detections": [
+          {
+            "license_expression": "bsd-new",
+            "license_expression_spdx": "BSD-3-Clause",
+            "matches": [
+              {
+                "license_expression": "bsd-new",
+                "spdx_license_expression": "BSD-3-Clause",
+                "from_file": "google-built-collection/LICENSE",
+                "start_line": 3,
+                "end_line": 28,
+                "matcher": "2-aho",
+                "score": 100.0,
+                "matched_length": 212,
+                "match_coverage": 100.0,
+                "rule_relevance": 100,
+                "rule_identifier": "bsd-new_166.RULE",
+                "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
+                "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              }
+            ],
+            "detection_log": [],
+            "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+          }
+        ],
+        "other_license_expression": null,
+        "other_license_expression_spdx": null,
+        "other_license_detections": [],
+        "extracted_license_statement": null,
+        "notice_text": null,
+        "source_packages": [],
+        "extra_data": {},
+        "repository_homepage_url": "https://pub.dev/packages/built_collection/versions/5.1.1",
+        "repository_download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+        "api_data_url": "https://pub.dev/api/packages/built_collection/versions/5.1.1",
+        "package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "datafile_paths": [
+          "pubspec.yaml"
+        ],
+        "datasource_ids": [
+          "pubspec_yaml"
+        ],
+        "purl": "pkg:dart/built_collection@5.1.1"
+      }
+    ],
+    "dependencies": [
+      {
+        "purl": "pkg:pubspec/pedantic",
+        "extracted_requirement": "^1.4.0",
+        "scope": "dev_dependencies",
+        "is_runtime": false,
+        "is_optional": true,
+        "is_resolved": false,
+        "resolved_package": {},
+        "extra_data": {},
+        "dependency_uid": "pkg:pubspec/pedantic?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "datafile_path": "pubspec.yaml",
+        "datasource_id": "pubspec_yaml"
+      },
+      {
+        "purl": "pkg:pubspec/test",
+        "extracted_requirement": "^1.16.0-nullsafety",
+        "scope": "dev_dependencies",
+        "is_runtime": false,
+        "is_optional": true,
+        "is_resolved": false,
+        "resolved_package": {},
+        "extra_data": {},
+        "dependency_uid": "pkg:pubspec/test?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "datafile_path": "pubspec.yaml",
+        "datasource_id": "pubspec_yaml"
+      },
+      {
+        "purl": "pkg:pubspec/sdk",
+        "extracted_requirement": ">=2.12.0-0 <3.0.0",
+        "scope": "environment",
+        "is_runtime": true,
+        "is_optional": false,
+        "is_resolved": false,
+        "resolved_package": {},
+        "extra_data": {},
+        "dependency_uid": "pkg:pubspec/sdk?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+        "datafile_path": "pubspec.yaml",
+        "datasource_id": "pubspec_yaml"
+      }
+    ],
+    "license_detections": [
+      {
+        "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2",
+        "license_expression": "bsd-new",
+        "license_expression_spdx": "BSD-3-Clause",
+        "detection_count": 2,
+        "detection_log": [],
+        "sample_matches": [
+          {
+            "license_expression": "bsd-new",
+            "license_expression_spdx": "BSD-3-Clause",
+            "from_file": "google-built-collection/LICENSE",
+            "start_line": 3,
+            "end_line": 28,
+            "matcher": "2-aho",
+            "score": 100.0,
+            "matched_length": 212,
+            "match_coverage": 100.0,
+            "rule_relevance": 100,
+            "rule_identifier": "bsd-new_166.RULE",
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
+            "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+            "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+          }
+        ]
+      }
+    ],
+    "files": [
+      {
+        "path": "LICENSE",
+        "type": "file",
+        "package_data": [],
+        "for_packages": [],
+        "detected_license_expression": "bsd-new",
+        "detected_license_expression_spdx": "BSD-3-Clause",
+        "license_detections": [
+          {
+            "license_expression": "bsd-new",
+            "license_expression_spdx": "BSD-3-Clause",
+            "matches": [
+              {
+                "license_expression": "bsd-new",
+                "spdx_license_expression": "BSD-3-Clause",
+                "from_file": "google-built-collection/LICENSE",
+                "start_line": 3,
+                "end_line": 28,
+                "matcher": "2-aho",
+                "score": 100.0,
+                "matched_length": 212,
+                "match_coverage": 100.0,
+                "rule_relevance": 100,
+                "rule_identifier": "bsd-new_166.RULE",
+                "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
+                "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              }
+            ],
+            "detection_log": [],
+            "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+          }
+        ],
+        "license_clues": [],
+        "percentage_of_license_text": 96.8,
+        "scan_errors": []
+      },
+      {
+        "path": "pubspec.yaml",
+        "type": "file",
+        "package_data": [
+          {
+            "type": "dart",
+            "namespace": null,
+            "name": "built_collection",
+            "version": "5.1.1",
+            "qualifiers": {},
+            "subpath": null,
+            "primary_language": "dart",
+            "description": "Immutable collections based on the SDK collections. Each SDK collection class is split into a new immutable collection class and a corresponding mutable builder class.\n",
+            "release_date": null,
+            "parties": [],
+            "keywords": [],
+            "homepage_url": null,
+            "download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+            "size": null,
+            "sha1": null,
+            "md5": null,
+            "sha256": null,
+            "sha512": null,
+            "bug_tracking_url": null,
+            "code_view_url": null,
+            "vcs_url": "https://github.com/google/built_collection.dart",
+            "copyright": null,
+            "holder": null,
+            "declared_license_expression": "bsd-new",
+            "declared_license_expression_spdx": "BSD-3-Clause",
+            "license_detections": [
+              {
+                "license_expression": "bsd-new",
+                "license_expression_spdx": "BSD-3-Clause",
+                "matches": [
+                  {
+                    "license_expression": "bsd-new",
+                    "spdx_license_expression": "BSD-3-Clause",
+                    "from_file": "google-built-collection/LICENSE",
+                    "start_line": 3,
+                    "end_line": 28,
+                    "matcher": "2-aho",
+                    "score": 100.0,
+                    "matched_length": 212,
+                    "match_coverage": 100.0,
+                    "rule_relevance": 100,
+                    "rule_identifier": "bsd-new_166.RULE",
+                    "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
+                    "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                    "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+                  }
+                ],
+                "detection_log": [],
+                "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+              }
+            ],
+            "other_license_expression": null,
+            "other_license_expression_spdx": null,
+            "other_license_detections": [],
+            "extracted_license_statement": null,
+            "notice_text": null,
+            "source_packages": [],
+            "file_references": [],
+            "extra_data": {},
+            "dependencies": [
+              {
+                "purl": "pkg:pubspec/pedantic",
+                "extracted_requirement": "^1.4.0",
+                "scope": "dev_dependencies",
+                "is_runtime": false,
+                "is_optional": true,
+                "is_resolved": false,
+                "resolved_package": {},
+                "extra_data": {}
+              },
+              {
+                "purl": "pkg:pubspec/test",
+                "extracted_requirement": "^1.16.0-nullsafety",
+                "scope": "dev_dependencies",
+                "is_runtime": false,
+                "is_optional": true,
+                "is_resolved": false,
+                "resolved_package": {},
+                "extra_data": {}
+              },
+              {
+                "purl": "pkg:pubspec/sdk",
+                "extracted_requirement": ">=2.12.0-0 <3.0.0",
+                "scope": "environment",
+                "is_runtime": true,
+                "is_optional": false,
+                "is_resolved": false,
+                "resolved_package": {},
+                "extra_data": {}
+              }
+            ],
+            "repository_homepage_url": "https://pub.dev/packages/built_collection/versions/5.1.1",
+            "repository_download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+            "api_data_url": "https://pub.dev/api/packages/built_collection/versions/5.1.1",
+            "datasource_id": "pubspec_yaml",
+            "purl": "pkg:dart/built_collection@5.1.1"
+          }
+        ],
+        "for_packages": [
+          "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758"
+        ],
+        "detected_license_expression": null,
+        "detected_license_expression_spdx": null,
+        "license_detections": [],
+        "license_clues": [],
+        "percentage_of_license_text": 0,
+        "scan_errors": []
+      }
+    ]
+  }
\ No newline at end of file
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 7575d7d9765..edf64b51cf2 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
@@ -32,22 +32,21 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google-built-collection/LICENSE",
               "start_line": 3,
               "end_line": 28,
-              "from_file": "google-built-collection/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 212,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_166.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_166.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
               "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             }
           ],
-          "detection_log": [],
           "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
         }
       ],
@@ -121,20 +120,19 @@
       "license_expression": "bsd-new",
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
-      "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "google-built-collection/LICENSE",
           "start_line": 3,
           "end_line": 28,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 212,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_166.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_166.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
           "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
         }
@@ -155,22 +153,21 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google-built-collection/LICENSE",
               "start_line": 3,
               "end_line": 28,
-              "from_file": "google-built-collection/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 212,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_166.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_166.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
               "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             }
           ],
-          "detection_log": [],
           "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
         }
       ],
@@ -214,22 +211,21 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google-built-collection/LICENSE",
                   "start_line": 3,
                   "end_line": 28,
-                  "from_file": "google-built-collection/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 212,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_166.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_166.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE",
                   "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
                 }
               ],
-              "detection_log": [],
               "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
             }
           ],
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
new file mode 100644
index 00000000000..11671cc45ec
--- /dev/null
+++ b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json
@@ -0,0 +1,286 @@
+{
+  "packages": [
+    {
+      "type": "dart",
+      "namespace": null,
+      "name": "built_collection",
+      "version": "5.1.1",
+      "qualifiers": {},
+      "subpath": null,
+      "primary_language": "dart",
+      "description": "Immutable collections based on the SDK collections. Each SDK collection class is split into a new immutable collection class and a corresponding mutable builder class.\n",
+      "release_date": null,
+      "parties": [],
+      "keywords": [],
+      "homepage_url": null,
+      "download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+      "size": null,
+      "sha1": null,
+      "md5": null,
+      "sha256": null,
+      "sha512": null,
+      "bug_tracking_url": null,
+      "code_view_url": null,
+      "vcs_url": "https://github.com/google/built_collection.dart",
+      "copyright": null,
+      "holder": null,
+      "declared_license_expression": "bsd-new",
+      "declared_license_expression_spdx": "BSD-3-Clause",
+      "license_detections": [
+        {
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
+          "matches": [
+            {
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google-built-collection/LICENSE",
+              "start_line": 3,
+              "end_line": 28,
+              "matcher": "2-aho",
+              "score": 100.0,
+              "matched_length": 212,
+              "match_coverage": 100.0,
+              "rule_relevance": 100,
+              "rule_identifier": "bsd-new_166.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE"
+            }
+          ],
+          "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+        }
+      ],
+      "other_license_expression": null,
+      "other_license_expression_spdx": null,
+      "other_license_detections": [],
+      "extracted_license_statement": null,
+      "notice_text": null,
+      "source_packages": [],
+      "extra_data": {},
+      "repository_homepage_url": "https://pub.dev/packages/built_collection/versions/5.1.1",
+      "repository_download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+      "api_data_url": "https://pub.dev/api/packages/built_collection/versions/5.1.1",
+      "package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_paths": [
+        "pubspec.yaml"
+      ],
+      "datasource_ids": [
+        "pubspec_yaml"
+      ],
+      "purl": "pkg:dart/built_collection@5.1.1"
+    }
+  ],
+  "dependencies": [
+    {
+      "purl": "pkg:pubspec/pedantic",
+      "extracted_requirement": "^1.4.0",
+      "scope": "dev_dependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": false,
+      "resolved_package": {},
+      "extra_data": {},
+      "dependency_uid": "pkg:pubspec/pedantic?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "pubspec.yaml",
+      "datasource_id": "pubspec_yaml"
+    },
+    {
+      "purl": "pkg:pubspec/test",
+      "extracted_requirement": "^1.16.0-nullsafety",
+      "scope": "dev_dependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": false,
+      "resolved_package": {},
+      "extra_data": {},
+      "dependency_uid": "pkg:pubspec/test?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "pubspec.yaml",
+      "datasource_id": "pubspec_yaml"
+    },
+    {
+      "purl": "pkg:pubspec/sdk",
+      "extracted_requirement": ">=2.12.0-0 <3.0.0",
+      "scope": "environment",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": false,
+      "resolved_package": {},
+      "extra_data": {},
+      "dependency_uid": "pkg:pubspec/sdk?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "for_package_uid": "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758",
+      "datafile_path": "pubspec.yaml",
+      "datasource_id": "pubspec_yaml"
+    }
+  ],
+  "license_detections": [
+    {
+      "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2",
+      "license_expression": "bsd-new",
+      "license_expression_spdx": "BSD-3-Clause",
+      "detection_count": 2,
+      "sample_matches": [
+        {
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
+          "from_file": "google-built-collection/LICENSE",
+          "start_line": 3,
+          "end_line": 28,
+          "matcher": "2-aho",
+          "score": 100.0,
+          "matched_length": 212,
+          "match_coverage": 100.0,
+          "rule_relevance": 100,
+          "rule_identifier": "bsd-new_166.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE"
+        }
+      ]
+    }
+  ],
+  "files": [
+    {
+      "path": "LICENSE",
+      "type": "file",
+      "package_data": [],
+      "for_packages": [],
+      "detected_license_expression": "bsd-new",
+      "detected_license_expression_spdx": "BSD-3-Clause",
+      "license_detections": [
+        {
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
+          "matches": [
+            {
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google-built-collection/LICENSE",
+              "start_line": 3,
+              "end_line": 28,
+              "matcher": "2-aho",
+              "score": 100.0,
+              "matched_length": 212,
+              "match_coverage": 100.0,
+              "rule_relevance": 100,
+              "rule_identifier": "bsd-new_166.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE"
+            }
+          ],
+          "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+        }
+      ],
+      "license_clues": [],
+      "percentage_of_license_text": 96.8,
+      "scan_errors": []
+    },
+    {
+      "path": "pubspec.yaml",
+      "type": "file",
+      "package_data": [
+        {
+          "type": "dart",
+          "namespace": null,
+          "name": "built_collection",
+          "version": "5.1.1",
+          "qualifiers": {},
+          "subpath": null,
+          "primary_language": "dart",
+          "description": "Immutable collections based on the SDK collections. Each SDK collection class is split into a new immutable collection class and a corresponding mutable builder class.\n",
+          "release_date": null,
+          "parties": [],
+          "keywords": [],
+          "homepage_url": null,
+          "download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+          "size": null,
+          "sha1": null,
+          "md5": null,
+          "sha256": null,
+          "sha512": null,
+          "bug_tracking_url": null,
+          "code_view_url": null,
+          "vcs_url": "https://github.com/google/built_collection.dart",
+          "copyright": null,
+          "holder": null,
+          "declared_license_expression": "bsd-new",
+          "declared_license_expression_spdx": "BSD-3-Clause",
+          "license_detections": [
+            {
+              "license_expression": "bsd-new",
+              "license_expression_spdx": "BSD-3-Clause",
+              "matches": [
+                {
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google-built-collection/LICENSE",
+                  "start_line": 3,
+                  "end_line": 28,
+                  "matcher": "2-aho",
+                  "score": 100.0,
+                  "matched_length": 212,
+                  "match_coverage": 100.0,
+                  "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_166.RULE",
+                  "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_166.RULE"
+                }
+              ],
+              "identifier": "bsd_new-050b3051-820b-200e-26c9-1a3c8e9761d2"
+            }
+          ],
+          "other_license_expression": null,
+          "other_license_expression_spdx": null,
+          "other_license_detections": [],
+          "extracted_license_statement": null,
+          "notice_text": null,
+          "source_packages": [],
+          "file_references": [],
+          "extra_data": {},
+          "dependencies": [
+            {
+              "purl": "pkg:pubspec/pedantic",
+              "extracted_requirement": "^1.4.0",
+              "scope": "dev_dependencies",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": false,
+              "resolved_package": {},
+              "extra_data": {}
+            },
+            {
+              "purl": "pkg:pubspec/test",
+              "extracted_requirement": "^1.16.0-nullsafety",
+              "scope": "dev_dependencies",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": false,
+              "resolved_package": {},
+              "extra_data": {}
+            },
+            {
+              "purl": "pkg:pubspec/sdk",
+              "extracted_requirement": ">=2.12.0-0 <3.0.0",
+              "scope": "environment",
+              "is_runtime": true,
+              "is_optional": false,
+              "is_resolved": false,
+              "resolved_package": {},
+              "extra_data": {}
+            }
+          ],
+          "repository_homepage_url": "https://pub.dev/packages/built_collection/versions/5.1.1",
+          "repository_download_url": "https://pub.dartlang.org/packages/built_collection/versions/5.1.1.tar.gz",
+          "api_data_url": "https://pub.dev/api/packages/built_collection/versions/5.1.1",
+          "datasource_id": "pubspec_yaml",
+          "purl": "pkg:dart/built_collection@5.1.1"
+        }
+      ],
+      "for_packages": [
+        "pkg:dart/built_collection@5.1.1?uuid=fixed-uid-done-for-testing-5642512d1758"
+      ],
+      "detected_license_expression": null,
+      "detected_license_expression_spdx": null,
+      "license_detections": [],
+      "license_clues": [],
+      "percentage_of_license_text": 0,
+      "scan_errors": []
+    }
+  ]
+}
\ No newline at end of file
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 f7da7a66e9b..3793cb30024 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
@@ -58,19 +58,20 @@
           "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
-              "score": 94.81,
+              "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
+              "from_file": "jquery-form-3.51.0/README.md",
               "start_line": 12,
               "end_line": 21,
-              "from_file": "jquery-form-3.51.0/README.md",
+              "matcher": "3-seq",
+              "score": 94.81,
               "matched_length": 128,
               "match_coverage": 94.81,
-              "matcher": "3-seq",
-              "license_expression": "mit OR gpl-2.0",
-              "spdx_license_expression": "MIT OR GPL-2.0-only",
-              "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
-              "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
+              "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact.",
+              "matched_text_diagnostics": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
             }
           ],
           "detection_log": [],
@@ -143,17 +144,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "composer.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "composer.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -165,17 +166,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "composer.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "composer.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_52.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_52.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
               "matched_text": "GPL-2.0"
             }
@@ -246,17 +247,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -268,17 +269,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
               "matched_text": "http://malsup.github.com/mit-license.txt"
             }
@@ -290,17 +291,17 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package.json",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
               "matched_text": "GPL"
             }
@@ -312,17 +313,17 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_200.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_200.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
               "matched_text": "http://malsup.github.com/gpl-license-v2.txt"
             }
@@ -473,34 +474,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit OR gpl-2.0-plus",
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit OR gpl-2.0-plus",
-          "license_expression_spdx": "MIT OR GPL-2.0-or-later",
-          "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0-plus_1.RULE",
-          "matched_text": "license\": [\n    \"MIT\",\n    \"GPL-"
+          "matched_text": "  \"license\": [\n    \"MIT\",\n    \"GPL-2.0\"",
+          "matched_text_diagnostics": "license\": [\n    \"MIT\",\n    \"GPL-"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "jquery-form-3.51.0/composer.json",
           "start_line": 23,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0_52.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
-          "matched_text": "GPL-2.0\""
+          "matched_text": "    \"GPL-2.0\"",
+          "matched_text_diagnostics": "GPL-2.0\""
         }
       ]
     },
@@ -512,17 +515,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 50.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "jquery-form-3.51.0/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 50.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_relevance": 50,
+          "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
           "matched_text": "GPL"
         }
@@ -536,17 +539,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "jquery-form-3.51.0/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_200.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_200.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
           "matched_text": "http://malsup.github.com/gpl-license-v2.txt"
         }
@@ -560,17 +563,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "jquery-form-3.51.0/composer.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_52.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0_52.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
           "matched_text": "GPL-2.0"
         }
@@ -584,17 +587,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "jquery-form-3.51.0/composer.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_url": null,
           "matched_text": "MIT"
         }
@@ -608,17 +611,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "jquery-form-3.51.0/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_14.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
           "matched_text": "http://malsup.github.com/mit-license.txt"
         }
@@ -632,19 +635,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 94.81,
+          "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "from_file": "jquery-form-3.51.0/README.md",
           "start_line": 12,
           "end_line": 21,
+          "matcher": "3-seq",
+          "score": 94.81,
           "matched_length": 128,
           "match_coverage": 94.81,
-          "matcher": "3-seq",
-          "license_expression": "mit OR gpl-2.0",
-          "license_expression_spdx": "MIT OR GPL-2.0-only",
-          "rule_identifier": "mit_or_gpl-2.0_68.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_or_gpl-2.0_68.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
-          "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
+          "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact.",
+          "matched_text_diagnostics": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
         }
       ]
     },
@@ -656,19 +660,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit OR gpl-2.0",
+          "license_expression_spdx": "MIT OR GPL-2.0-only",
           "from_file": "jquery-form-3.51.0/package.json",
           "start_line": 17,
           "end_line": 22,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 21,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit OR gpl-2.0",
-          "license_expression_spdx": "MIT OR GPL-2.0-only",
-          "rule_identifier": "mit_or_gpl-2.0_69.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_or_gpl-2.0_69.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_69.RULE",
-          "matched_text": "type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\""
+          "matched_text": "      \"type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\"",
+          "matched_text_diagnostics": "type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\""
         }
       ]
     }
@@ -694,19 +699,20 @@
           "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
-              "score": 94.81,
+              "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
+              "from_file": "jquery-form-3.51.0/README.md",
               "start_line": 12,
               "end_line": 21,
-              "from_file": "jquery-form-3.51.0/README.md",
+              "matcher": "3-seq",
+              "score": 94.81,
               "matched_length": 128,
               "match_coverage": 94.81,
-              "matcher": "3-seq",
-              "license_expression": "mit OR gpl-2.0",
-              "spdx_license_expression": "MIT OR GPL-2.0-only",
-              "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_gpl-2.0_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
-              "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
+              "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact.",
+              "matched_text_diagnostics": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
             }
           ],
           "detection_log": [],
@@ -753,19 +759,20 @@
               "license_expression_spdx": "MIT OR GPL-2.0-only",
               "matches": [
                 {
-                  "score": 94.81,
+                  "license_expression": "mit OR gpl-2.0",
+                  "spdx_license_expression": "MIT OR GPL-2.0-only",
+                  "from_file": "jquery-form-3.51.0/README.md",
                   "start_line": 12,
                   "end_line": 21,
-                  "from_file": "jquery-form-3.51.0/README.md",
+                  "matcher": "3-seq",
+                  "score": 94.81,
                   "matched_length": 128,
                   "match_coverage": 94.81,
-                  "matcher": "3-seq",
-                  "license_expression": "mit OR gpl-2.0",
-                  "spdx_license_expression": "MIT OR GPL-2.0-only",
-                  "rule_identifier": "mit_or_gpl-2.0_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_or_gpl-2.0_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_68.RULE",
-                  "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
+                  "matched_text": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact.",
+                  "matched_text_diagnostics": "are dual licensed under the MIT and GPL licenses:\n\n* [MIT](http://malsup.github.com/mit-license.txt)\n* [GPL](http://malsup.github.com/gpl-license-v2.txt)\n\nYou may use either license.  The MIT License is recommended for most projects because it is simple and easy to understand and it places almost no restrictions on what you can do with the plugin.\n\nIf the GPL suits your project better you are also free to use the plugin under that license.\n\nYou don't have to do anything special to choose one license or the other and you don't have to notify anyone which license you are using. You are free to use the jQuery Form Plugin in commercial projects as long as the copyright header is left intact."
                 }
               ],
               "detection_log": [],
@@ -866,17 +873,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "jquery-form-3.51.0/composer.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/composer.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -888,17 +895,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": "jquery-form-3.51.0/composer.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/composer.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_52.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_52.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
                   "matched_text": "GPL-2.0"
                 }
@@ -950,34 +957,36 @@
           "license_expression_spdx": "(MIT OR GPL-2.0-or-later) AND GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit OR gpl-2.0-plus",
+              "spdx_license_expression": "MIT OR GPL-2.0-or-later",
+              "from_file": "jquery-form-3.51.0/composer.json",
               "start_line": 21,
               "end_line": 23,
-              "from_file": "jquery-form-3.51.0/composer.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit OR gpl-2.0-plus",
-              "spdx_license_expression": "MIT OR GPL-2.0-or-later",
-              "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_gpl-2.0-plus_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0-plus_1.RULE",
-              "matched_text": "license\": [\n    \"MIT\",\n    \"GPL-"
+              "matched_text": "  \"license\": [\n    \"MIT\",\n    \"GPL-2.0\"",
+              "matched_text_diagnostics": "license\": [\n    \"MIT\",\n    \"GPL-"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "jquery-form-3.51.0/composer.json",
               "start_line": 23,
               "end_line": 23,
-              "from_file": "jquery-form-3.51.0/composer.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_52.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_52.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_52.RULE",
-              "matched_text": "GPL-2.0\""
+              "matched_text": "    \"GPL-2.0\"",
+              "matched_text_diagnostics": "GPL-2.0\""
             }
           ],
           "detection_log": [],
@@ -1036,17 +1045,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "jquery-form-3.51.0/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1058,17 +1067,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "jquery-form-3.51.0/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/package.json",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
                   "matched_text": "http://malsup.github.com/mit-license.txt"
                 }
@@ -1080,17 +1089,17 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "jquery-form-3.51.0/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/package.json",
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
                   "matched_text": "GPL"
                 }
@@ -1102,17 +1111,17 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "jquery-form-3.51.0/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jquery-form-3.51.0/package.json",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_200.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl_200.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_200.RULE",
                   "matched_text": "http://malsup.github.com/gpl-license-v2.txt"
                 }
@@ -1213,19 +1222,20 @@
           "license_expression_spdx": "MIT OR GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit OR gpl-2.0",
+              "spdx_license_expression": "MIT OR GPL-2.0-only",
+              "from_file": "jquery-form-3.51.0/package.json",
               "start_line": 17,
               "end_line": 22,
-              "from_file": "jquery-form-3.51.0/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 21,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit OR gpl-2.0",
-              "spdx_license_expression": "MIT OR GPL-2.0-only",
-              "rule_identifier": "mit_or_gpl-2.0_69.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_gpl-2.0_69.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_gpl-2.0_69.RULE",
-              "matched_text": "type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\""
+              "matched_text": "      \"type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\"",
+              "matched_text_diagnostics": "type\": \"MIT\",\n      \"url\": \"http://malsup.github.com/mit-license.txt\"\n    },\n    {\n      \"type\": \"GPL\",\n      \"url\": \"http://malsup.github.com/gpl-license-v2.txt\""
             }
           ],
           "detection_log": [],
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 d78c1058636..f1a511b6aa5 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
@@ -40,49 +40,51 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 16.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "Fizzler.nuspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Fizzler.nuspec",
+              "matcher": "1-hash",
+              "score": 16.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_383.RULE",
               "rule_relevance": 16,
+              "rule_identifier": "unknown-license-reference_383.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
               "matched_text": "license COPYING.txt"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_63.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
             }
           ],
           "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
@@ -158,49 +160,52 @@
       ],
       "sample_matches": [
         {
-          "score": 33.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "fizzler/Fizzler.nuspec",
           "start_line": 9,
           "end_line": 9,
+          "matcher": "2-aho",
+          "score": 33.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_382.RULE",
           "rule_relevance": 33,
+          "rule_identifier": "unknown-license-reference_382.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
-          "matched_text": "license type=\"file\">COPYING.txt"
+          "matched_text": "    COPYING.txt",
+          "matched_text_diagnostics": "license type=\"file\">COPYING.txt"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.0-plus",
-          "license_expression_spdx": "LGPL-2.0-or-later",
-          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_63.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
         }
       ]
     },
@@ -212,34 +217,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.0-plus",
-          "license_expression_spdx": "LGPL-2.0-or-later",
-          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_63.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
         }
       ]
     },
@@ -253,49 +260,51 @@
       ],
       "sample_matches": [
         {
-          "score": 16.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "fizzler/Fizzler.nuspec",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 16.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_383.RULE",
           "rule_relevance": 16,
+          "rule_identifier": "unknown-license-reference_383.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
           "matched_text": "license COPYING.txt"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.0-plus",
-          "license_expression_spdx": "LGPL-2.0-or-later",
-          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.0-plus_87.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "fizzler/COPYING.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_63.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_63.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE"
+          "matched_text": "GNU GENERAL PUBLIC LICENSE",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
         }
       ]
     }
@@ -314,34 +323,36 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_63.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
             }
           ],
           "detection_log": [],
@@ -396,49 +407,51 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 16.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "fizzler/Fizzler.nuspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "fizzler/Fizzler.nuspec",
+                  "matcher": "1-hash",
+                  "score": 16.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_383.RULE",
                   "rule_relevance": 16,
+                  "rule_identifier": "unknown-license-reference_383.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_383.RULE",
                   "matched_text": "license COPYING.txt"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "fizzler/COPYING.txt",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "fizzler/COPYING.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-                  "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+                  "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+                  "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "fizzler/COPYING.txt",
                   "start_line": 3,
                   "end_line": 3,
-                  "from_file": "fizzler/COPYING.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_63.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl_63.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE"
+                  "matched_text": "GNU GENERAL PUBLIC LICENSE",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
                 }
               ],
               "identifier": "lgpl_2_0_plus_and_gpl_1_0_plus-de66a0ae-df4d-ab6b-975e-8deb27c0f945",
@@ -501,49 +514,52 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 33.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "fizzler/Fizzler.nuspec",
               "start_line": 9,
               "end_line": 9,
-              "from_file": "fizzler/Fizzler.nuspec",
+              "matcher": "2-aho",
+              "score": 33.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_382.RULE",
               "rule_relevance": 33,
+              "rule_identifier": "unknown-license-reference_382.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_382.RULE",
-              "matched_text": "license type=\"file\">COPYING.txt"
+              "matched_text": "    COPYING.txt",
+              "matched_text_diagnostics": "license type=\"file\">COPYING.txt"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
-              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU LESSER GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU LESSER GENERAL PUBLIC LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "fizzler/COPYING.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "fizzler/COPYING.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_63.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_63.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_63.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE"
+              "matched_text": "GNU GENERAL PUBLIC LICENSE",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE"
             }
           ],
           "detection_log": [
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 99913c38c6e..0a03ef49ed6 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
@@ -40,49 +40,51 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "flutter_paytabs_bridge.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "flutter_paytabs_bridge.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
               "matched_text": "license :file = ../LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-              "matched_text": "MIT License"
+              "matched_text": "MIT License",
+              "matched_text_diagnostics": "MIT License"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 5,
               "end_line": 21,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+              "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
             }
           ],
           "identifier": "mit-a979a2a3-dfdb-02aa-2450-71641a61a264",
@@ -123,49 +125,52 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
-          "matched_text": "license          = { :file => '../LICENSE' }"
+          "matched_text": "  s.license          = { :file => '../LICENSE' }",
+          "matched_text_diagnostics": "license          = { :file => '../LICENSE' }"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "flutter_playtabs_bridge/LICENSE",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_14.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-          "matched_text": "MIT License"
+          "matched_text": "MIT License",
+          "matched_text_diagnostics": "MIT License"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "flutter_playtabs_bridge/LICENSE",
           "start_line": 5,
           "end_line": 21,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "mit.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+          "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
         }
       ]
     },
@@ -177,34 +182,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "flutter_playtabs_bridge/LICENSE",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_14.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_14.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-          "matched_text": "MIT License"
+          "matched_text": "MIT License",
+          "matched_text_diagnostics": "MIT License"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "flutter_playtabs_bridge/LICENSE",
           "start_line": 5,
           "end_line": 21,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "mit.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+          "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
         }
       ]
     }
@@ -223,34 +230,36 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-              "matched_text": "MIT License"
+              "matched_text": "MIT License",
+              "matched_text_diagnostics": "MIT License"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 5,
               "end_line": 21,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+              "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
             }
           ],
           "detection_log": [],
@@ -305,49 +314,51 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
                   "matched_text": "license :file = ../LICENSE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "flutter_playtabs_bridge/LICENSE",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "flutter_playtabs_bridge/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-                  "matched_text": "MIT License"
+                  "matched_text": "MIT License",
+                  "matched_text_diagnostics": "MIT License"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "flutter_playtabs_bridge/LICENSE",
                   "start_line": 5,
                   "end_line": 21,
-                  "from_file": "flutter_playtabs_bridge/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-                  "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+                  "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+                  "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
                 }
               ],
               "identifier": "mit-a979a2a3-dfdb-02aa-2450-71641a61a264",
@@ -383,49 +394,52 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
               "start_line": 13,
               "end_line": 13,
-              "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
-              "matched_text": "license          = { :file => '../LICENSE' }"
+              "matched_text": "  s.license          = { :file => '../LICENSE' }",
+              "matched_text_diagnostics": "license          = { :file => '../LICENSE' }"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
-              "matched_text": "MIT License"
+              "matched_text": "MIT License",
+              "matched_text_diagnostics": "MIT License"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "flutter_playtabs_bridge/LICENSE",
               "start_line": 5,
               "end_line": 21,
-              "from_file": "flutter_playtabs_bridge/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.",
+              "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
             }
           ],
           "detection_log": [
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 96ad42eb558..01f35f8116d 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
@@ -40,34 +40,35 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "nanopb.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
               "matched_text": ":type = zlib, :file = LICENSE.txt"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "nanopb/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+              "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
             }
           ],
           "identifier": "zlib-9531c668-be8d-7a25-49eb-c18c9dcd616b",
@@ -108,34 +109,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "nanopb/nanopb.podspec",
           "start_line": 14,
           "end_line": 14,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_in_manifest.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "zlib_in_manifest.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
-          "matched_text": "type => 'zlib', :file => 'LICENSE.txt' }"
+          "matched_text": "  s.license      = { :type => 'zlib', :file => 'LICENSE.txt' }",
+          "matched_text_diagnostics": "type => 'zlib', :file => 'LICENSE.txt' }"
         },
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "nanopb/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "zlib.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+          "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
         }
       ]
     },
@@ -147,19 +150,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "nanopb/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "zlib.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+          "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+          "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
         }
       ]
     }
@@ -178,19 +182,20 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "nanopb/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+              "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
             }
           ],
           "detection_log": [],
@@ -245,34 +250,35 @@
               "license_expression_spdx": "Zlib",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": "nanopb/nanopb.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "nanopb/nanopb.podspec",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
                   "matched_text": ":type = zlib, :file = LICENSE.txt"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": "nanopb/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "nanopb/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 132,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "zlib.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "zlib.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-                  "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+                  "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+                  "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
                 }
               ],
               "identifier": "zlib-9531c668-be8d-7a25-49eb-c18c9dcd616b",
@@ -308,34 +314,36 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb/nanopb.podspec",
               "start_line": 14,
               "end_line": 14,
-              "from_file": "nanopb/nanopb.podspec",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
-              "matched_text": "type => 'zlib', :file => 'LICENSE.txt' }"
+              "matched_text": "  s.license      = { :type => 'zlib', :file => 'LICENSE.txt' }",
+              "matched_text_diagnostics": "type => 'zlib', :file => 'LICENSE.txt' }"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "nanopb/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
+              "matched_text": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution.",
+              "matched_text_diagnostics": "This software is provided 'as-is', without any express or \nimplied warranty. In no event will the authors be held liable \nfor any damages arising from the use of this software.\n\nPermission is granted to anyone to use this software for any \npurpose, including commercial applications, and to alter it and \nredistribute it freely, subject to the following restrictions:\n\n1. The origin of this software must not be misrepresented; you \n   must not claim that you wrote the original software. If you use \n   this software in a product, an acknowledgment in the product \n   documentation would be appreciated but is not required.\n\n2. Altered source versions must be plainly marked as such, and \n   must not be misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source \n   distribution."
             }
           ],
           "detection_log": [
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 2f1eef8380f..40f7bf0b3cd 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
@@ -52,17 +52,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -102,19 +102,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "base-example/PKG-INFO",
           "start_line": 16,
           "end_line": 16,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-          "matched_text": "License :: OSI Approved :: BSD License"
+          "matched_text": "Classifier: License :: OSI Approved :: BSD License",
+          "matched_text_diagnostics": "License :: OSI Approved :: BSD License"
         }
       ]
     },
@@ -128,32 +129,33 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "base-example/django.po",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
-          "matched_text": "This file is distributed under the same license as the package."
+          "matched_text": "# This file is distributed under the same license as the package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the package."
         },
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "PKG-INFO",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
           "matched_text": "- 'License :: OSI Approved :: BSD License'"
         }
@@ -217,17 +219,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "base-example/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "base-example/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -264,19 +266,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "base-example/PKG-INFO",
               "start_line": 16,
               "end_line": 16,
-              "from_file": "base-example/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-              "matched_text": "License :: OSI Approved :: BSD License"
+              "matched_text": "Classifier: License :: OSI Approved :: BSD License",
+              "matched_text_diagnostics": "License :: OSI Approved :: BSD License"
             }
           ],
           "detection_log": [],
@@ -302,32 +305,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "base-example/django.po",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "base-example/django.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
-              "matched_text": "This file is distributed under the same license as the package."
+              "matched_text": "# This file is distributed under the same license as the package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
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 f1781014972..2c9b162ebda 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
@@ -4763,19 +4763,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 441,
           "end_line": 441,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_195.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_195.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-          "matched_text": "License: BSD-3-clause"
+          "matched_text": "License: BSD-3-clause",
+          "matched_text_diagnostics": "License: BSD-3-clause"
         }
       ]
     },
@@ -4787,19 +4788,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1501,
           "end_line": 1501,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original",
-          "license_expression_spdx": "BSD-4-Clause",
-          "rule_identifier": "bsd-original_43.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-original_43.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-          "matched_text": "License: BSD-4-clause"
+          "matched_text": "License: BSD-4-clause",
+          "matched_text_diagnostics": "License: BSD-4-clause"
         }
       ]
     },
@@ -4811,19 +4813,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-simplified",
+          "license_expression_spdx": "BSD-2-Clause",
           "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 2880,
           "end_line": 2880,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-simplified",
-          "license_expression_spdx": "BSD-2-Clause",
-          "rule_identifier": "bsd-simplified_136.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-simplified_136.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
-          "matched_text": "License: BSD (2 clause)"
+          "matched_text": "License: BSD (2 clause)",
+          "matched_text_diagnostics": "License: BSD (2 clause)"
         }
       ]
     },
@@ -4835,19 +4838,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "fusiondirectory/debian/po/fr.po",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
-          "matched_text": "This file is distributed under the same license as the package."
+          "matched_text": "# This file is distributed under the same license as the package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the package."
         }
       ]
     },
@@ -4859,19 +4863,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "fusiondirectory/debian/po/de.po",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-          "matched_text": "This file is distributed under the same license as the"
+          "matched_text": "# This file is distributed under the same license as the fusiondirectory package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the"
         }
       ]
     },
@@ -4883,19 +4888,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 2692,
           "end_line": 2692,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_687.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_687.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-          "matched_text": "License: GPL (v2 or later)"
+          "matched_text": "License: GPL (v2 or later)",
+          "matched_text_diagnostics": "License: GPL (v2 or later)"
         }
       ]
     },
@@ -4907,19 +4913,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 297,
           "end_line": 297,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "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+"
+          "matched_text": "License: GPL-2+",
+          "matched_text_diagnostics": "License: GPL-2+"
         }
       ]
     },
@@ -4934,19 +4941,20 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1099,
           "end_line": 1099,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_67.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_67.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
-          "matched_text": "GPL-2+)."
+          "matched_text": "  FusionDirectory (i.e. GPL-2+).",
+          "matched_text_diagnostics": "GPL-2+)."
         }
       ]
     },
@@ -4958,34 +4966,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 411,
           "end_line": 411,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "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+"
+          "matched_text": "License: GPL-2+",
+          "matched_text_diagnostics": "License: GPL-2+"
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 413,
           "end_line": 413,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": " This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         }
       ]
     },
@@ -4997,34 +5007,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 560,
           "end_line": 560,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "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+"
+          "matched_text": "License: GPL-2+",
+          "matched_text_diagnostics": "License: GPL-2+"
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 562,
           "end_line": 562,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-          "matched_text": "This file is distributed under the same license as the"
+          "matched_text": " This file is distributed under the same license as the fusiondirectory package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the"
         }
       ]
     },
@@ -5036,334 +5048,356 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "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+"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "License: GPL-2+"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_89.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_89.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
-          "matched_text": "GPL-3+"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "GPL-3+"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_64.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.1-plus_64.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
-          "matched_text": "LGPL-2.1+"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "LGPL-2.1+"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_36.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_36.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
-          "matched_text": "LGPL-3+"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "LGPL-3+"
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_10.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_10.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
-          "matched_text": "BSD-3-clause"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "BSD-3-clause"
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1521,
           "end_line": 1521,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original",
-          "license_expression_spdx": "BSD-4-Clause",
-          "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
-          "matched_text": "BSD-4-clause"
+          "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+          "matched_text_diagnostics": "BSD-4-clause"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1523,
           "end_line": 1523,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_22.RULE",
           "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+"
+          "matched_text": "License: GPL-2+",
+          "matched_text_diagnostics": "License: GPL-2+"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1524,
           "end_line": 1539,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 136,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_1038.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_1038.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
-          "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
+          "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.",
+          "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1541,
           "end_line": 1541,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_92.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_92.RULE",
           "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+"
+          "matched_text": "License: GPL-3+",
+          "matched_text_diagnostics": "License: GPL-3+"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1542,
           "end_line": 1557,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 136,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_512.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_512.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
-          "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
+          "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.",
+          "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1559,
           "end_line": 1559,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_108.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.1-plus_108.RULE",
           "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+"
+          "matched_text": "License: LGPL-2.1+",
+          "matched_text_diagnostics": "License: LGPL-2.1+"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1560,
           "end_line": 1577,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 146,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_418.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.1-plus_418.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
-          "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
+          "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'.",
+          "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1579,
           "end_line": 1579,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_437.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_437.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-          "matched_text": "License: Expat"
+          "matched_text": "License: Expat",
+          "matched_text_diagnostics": "License: Expat"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1580,
           "end_line": 1596,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "mit.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
+          "matched_text": " Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.",
+          "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1598,
           "end_line": 1598,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_195.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_195.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-          "matched_text": "License: BSD-3-clause"
+          "matched_text": "License: BSD-3-clause",
+          "matched_text_diagnostics": "License: BSD-3-clause"
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1599,
           "end_line": 1621,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 213,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_577.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_577.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+          "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1623,
           "end_line": 1623,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original",
-          "license_expression_spdx": "BSD-4-Clause",
-          "rule_identifier": "bsd-original_43.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-original_43.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-          "matched_text": "License: BSD-4-clause"
+          "matched_text": "License: BSD-4-clause",
+          "matched_text_diagnostics": "License: BSD-4-clause"
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-original",
+          "license_expression_spdx": "BSD-4-Clause",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1624,
           "end_line": 1649,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 236,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original",
-          "license_expression_spdx": "BSD-4-Clause",
-          "rule_identifier": "bsd-original_71.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-original_71.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+          "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1651,
           "end_line": 1651,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "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+"
+          "matched_text": "License: LGPL-3+",
+          "matched_text_diagnostics": "License: LGPL-3+"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1652,
           "end_line": 1663,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 105,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_189.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_189.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
-          "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
+          "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'.",
+          "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
         },
         {
-          "score": 99.0,
+          "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1665,
           "end_line": 1665,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "public-domain",
-          "license_expression_spdx": "LicenseRef-scancode-public-domain",
-          "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_public_domain.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-          "matched_text": "License: public-domain"
+          "matched_text": "License: public-domain",
+          "matched_text_diagnostics": "License: public-domain"
         },
         {
-          "score": 100.0,
+          "license_expression": "other-permissive",
+          "license_expression_spdx": "LicenseRef-scancode-other-permissive",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1666,
           "end_line": 1669,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 40,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "other-permissive",
-          "license_expression_spdx": "LicenseRef-scancode-other-permissive",
-          "rule_identifier": "other-permissive_325.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "other-permissive_325.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
-          "matched_text": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
+          "matched_text": " This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any).",
+          "matched_text_diagnostics": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
         }
       ]
     },
@@ -5375,19 +5409,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 968,
           "end_line": 968,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_166.RULE",
           "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+"
+          "matched_text": "License: LGPL-3+",
+          "matched_text_diagnostics": "License: LGPL-3+"
         }
       ]
     },
@@ -5402,19 +5437,20 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1429,
           "end_line": 1429,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_437.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "mit_437.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-          "matched_text": "License: Expat"
+          "matched_text": "License: Expat",
+          "matched_text_diagnostics": "License: Expat"
         }
       ]
     },
@@ -5429,19 +5465,20 @@
       ],
       "sample_matches": [
         {
-          "score": 99.0,
+          "license_expression": "public-domain",
+          "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "from_file": "fusiondirectory/debian/copyright",
           "start_line": 1094,
           "end_line": 1094,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "public-domain",
-          "license_expression_spdx": "LicenseRef-scancode-public-domain",
-          "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_public_domain.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-          "matched_text": "License: public-domain"
+          "matched_text": "License: public-domain",
+          "matched_text_diagnostics": "License: public-domain"
         }
       ]
     }
@@ -5781,19 +5818,20 @@
       "license_detections": [],
       "license_clues": [
         {
-          "score": 4.71,
+          "license_expression": "borceux",
+          "spdx_license_expression": "Borceux",
+          "from_file": "fusiondirectory/debian/README.multi-orig-tarball-package",
           "start_line": 1,
           "end_line": 3,
-          "from_file": "fusiondirectory/debian/README.multi-orig-tarball-package",
+          "matcher": "3-seq",
+          "score": 4.71,
           "matched_length": 4,
           "match_coverage": 4.71,
-          "matcher": "3-seq",
-          "license_expression": "borceux",
-          "spdx_license_expression": "Borceux",
-          "rule_identifier": "borceux.LICENSE",
           "rule_relevance": 100,
+          "rule_identifier": "borceux.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
-          "matched_text": "package consists of [various] [tarballs].\n\n[This] README"
+          "matched_text": "This src:package consists of various tarballs.\n\nThis README is a dummy file for creating the base tarball of the name",
+          "matched_text_diagnostics": "package consists of [various] [tarballs].\n\n[This] README"
         }
       ],
       "percentage_of_license_text": 10.53,
@@ -5957,19 +5995,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 297,
                   "end_line": 297,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -5980,34 +6019,36 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 411,
                   "end_line": 411,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "free-unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 413,
                   "end_line": 413,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 12,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "free-unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-                  "rule_identifier": "free-unknown-package_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "free-unknown-package_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-                  "matched_text": "This file is distributed under the same license as the PACKAGE package."
+                  "matched_text": " This file is distributed under the same license as the PACKAGE package.",
+                  "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
                 }
               ],
               "detection_log": [],
@@ -6018,19 +6059,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 427,
                   "end_line": 427,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6041,19 +6083,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 433,
                   "end_line": 433,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6064,19 +6107,20 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 441,
                   "end_line": 441,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_195.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_195.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-                  "matched_text": "License: BSD-3-clause"
+                  "matched_text": "License: BSD-3-clause",
+                  "matched_text_diagnostics": "License: BSD-3-clause"
                 }
               ],
               "detection_log": [],
@@ -6087,19 +6131,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 452,
                   "end_line": 452,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6110,19 +6155,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 461,
                   "end_line": 461,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6133,19 +6179,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 475,
                   "end_line": 475,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6156,19 +6203,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 488,
                   "end_line": 488,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6179,19 +6227,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 495,
                   "end_line": 495,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6202,19 +6251,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 503,
                   "end_line": 503,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [],
@@ -6225,34 +6275,36 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 560,
                   "end_line": 560,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "free-unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 562,
                   "end_line": 562,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 10,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "free-unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-                  "rule_identifier": "free-unknown-package_4.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "free-unknown-package_4.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-                  "matched_text": "This file is distributed under the same license as the"
+                  "matched_text": " This file is distributed under the same license as the fusiondirectory package.",
+                  "matched_text_diagnostics": "This file is distributed under the same license as the"
                 }
               ],
               "detection_log": [],
@@ -6263,19 +6315,20 @@
               "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 968,
                   "end_line": 968,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "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+"
+                  "matched_text": "License: LGPL-3+",
+                  "matched_text_diagnostics": "License: LGPL-3+"
                 }
               ],
               "detection_log": [],
@@ -6286,19 +6339,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1094,
                   "end_line": 1094,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 99.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "pypi_public_domain.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_public_domain.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-                  "matched_text": "License: public-domain"
+                  "matched_text": "License: public-domain",
+                  "matched_text_diagnostics": "License: public-domain"
                 }
               ],
               "detection_log": [
@@ -6312,19 +6366,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1099,
                   "end_line": 1099,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_67.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_67.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
-                  "matched_text": "GPL-2+)."
+                  "matched_text": "  FusionDirectory (i.e. GPL-2+).",
+                  "matched_text_diagnostics": "GPL-2+)."
                 }
               ],
               "detection_log": [
@@ -6338,19 +6393,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1413,
                   "end_line": 1413,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6364,19 +6420,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1423,
                   "end_line": 1423,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6390,19 +6447,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1429,
                   "end_line": 1429,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_437.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-                  "matched_text": "License: Expat"
+                  "matched_text": "License: Expat",
+                  "matched_text_diagnostics": "License: Expat"
                 }
               ],
               "detection_log": [
@@ -6416,19 +6474,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1437,
                   "end_line": 1437,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6442,19 +6501,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1443,
                   "end_line": 1443,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6468,19 +6528,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1449,
                   "end_line": 1449,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6494,19 +6555,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1457,
                   "end_line": 1457,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6520,19 +6582,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1463,
                   "end_line": 1463,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6546,19 +6609,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1469,
                   "end_line": 1469,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6572,19 +6636,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1475,
                   "end_line": 1475,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6598,19 +6663,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1481,
                   "end_line": 1481,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6624,19 +6690,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1487,
                   "end_line": 1487,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6650,19 +6717,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1493,
                   "end_line": 1493,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 }
               ],
               "detection_log": [
@@ -6676,19 +6744,20 @@
               "license_expression_spdx": "BSD-4-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1501,
                   "end_line": 1501,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-original",
-                  "spdx_license_expression": "BSD-4-Clause",
-                  "rule_identifier": "bsd-original_43.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-original_43.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-                  "matched_text": "License: BSD-4-clause"
+                  "matched_text": "License: BSD-4-clause",
+                  "matched_text_diagnostics": "License: BSD-4-clause"
                 }
               ],
               "detection_log": [],
@@ -6699,19 +6768,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1507,
                   "end_line": 1507,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_437.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-                  "matched_text": "License: Expat"
+                  "matched_text": "License: Expat",
+                  "matched_text_diagnostics": "License: Expat"
                 }
               ],
               "detection_log": [
@@ -6725,19 +6795,20 @@
               "license_expression_spdx": null,
               "matches": [
                 {
-                  "score": 100.0,
-                  "start_line": 1513,
-                  "end_line": 1513,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
                   "from_file": "fusiondirectory/debian/copyright",
+                  "start_line": 1513,
+                  "end_line": 1513,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_437.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-                  "matched_text": "License: Expat"
+                  "matched_text": "License: Expat",
+                  "matched_text_diagnostics": "License: Expat"
                 }
               ],
               "detection_log": [
@@ -6751,334 +6822,356 @@
               "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_89.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
-                  "matched_text": "GPL-3+"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "GPL-3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_64.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_64.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
-                  "matched_text": "LGPL-2.1+"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "LGPL-2.1+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_36.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_36.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
-                  "matched_text": "LGPL-3+"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "LGPL-3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
-                  "matched_text": "BSD-3-clause"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "BSD-3-clause"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1521,
                   "end_line": 1521,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-original",
-                  "spdx_license_expression": "BSD-4-Clause",
-                  "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
-                  "matched_text": "BSD-4-clause"
+                  "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+                  "matched_text_diagnostics": "BSD-4-clause"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1523,
                   "end_line": 1523,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_22.RULE",
                   "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+"
+                  "matched_text": "License: GPL-2+",
+                  "matched_text_diagnostics": "License: GPL-2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1524,
                   "end_line": 1539,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 136,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_1038.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_1038.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
-                  "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
+                  "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.",
+                  "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1541,
                   "end_line": 1541,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_92.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_92.RULE",
                   "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+"
+                  "matched_text": "License: GPL-3+",
+                  "matched_text_diagnostics": "License: GPL-3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1542,
                   "end_line": 1557,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 136,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_512.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_512.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
-                  "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
+                  "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.",
+                  "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1559,
                   "end_line": 1559,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "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+"
+                  "matched_text": "License: LGPL-2.1+",
+                  "matched_text_diagnostics": "License: LGPL-2.1+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1560,
                   "end_line": 1577,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 146,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_418.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_418.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
-                  "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
+                  "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'.",
+                  "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1579,
                   "end_line": 1579,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_437.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_437.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-                  "matched_text": "License: Expat"
+                  "matched_text": "License: Expat",
+                  "matched_text_diagnostics": "License: Expat"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1580,
                   "end_line": 1596,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-                  "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
+                  "matched_text": " Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.",
+                  "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1598,
                   "end_line": 1598,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_195.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_195.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-                  "matched_text": "License: BSD-3-clause"
+                  "matched_text": "License: BSD-3-clause",
+                  "matched_text_diagnostics": "License: BSD-3-clause"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1599,
                   "end_line": 1621,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 213,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_577.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_577.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
-                  "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+                  "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                  "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1623,
                   "end_line": 1623,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-original",
-                  "spdx_license_expression": "BSD-4-Clause",
-                  "rule_identifier": "bsd-original_43.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-original_43.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-                  "matched_text": "License: BSD-4-clause"
+                  "matched_text": "License: BSD-4-clause",
+                  "matched_text_diagnostics": "License: BSD-4-clause"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-original",
+                  "spdx_license_expression": "BSD-4-Clause",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1624,
                   "end_line": 1649,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 236,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-original",
-                  "spdx_license_expression": "BSD-4-Clause",
-                  "rule_identifier": "bsd-original_71.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-original_71.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
-                  "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+                  "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                  "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1651,
                   "end_line": 1651,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_166.RULE",
                   "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+"
+                  "matched_text": "License: LGPL-3+",
+                  "matched_text_diagnostics": "License: LGPL-3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1652,
                   "end_line": 1663,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 105,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_189.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_189.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
-                  "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
+                  "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'.",
+                  "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
                 },
                 {
-                  "score": 99.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1665,
                   "end_line": 1665,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 99.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "pypi_public_domain.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_public_domain.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-                  "matched_text": "License: public-domain"
+                  "matched_text": "License: public-domain",
+                  "matched_text_diagnostics": "License: public-domain"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "other-permissive",
+                  "spdx_license_expression": "LicenseRef-scancode-other-permissive",
+                  "from_file": "fusiondirectory/debian/copyright",
                   "start_line": 1666,
                   "end_line": 1669,
-                  "from_file": "fusiondirectory/debian/copyright",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 40,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "other-permissive",
-                  "spdx_license_expression": "LicenseRef-scancode-other-permissive",
-                  "rule_identifier": "other-permissive_325.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "other-permissive_325.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
-                  "matched_text": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
+                  "matched_text": " This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any).",
+                  "matched_text_diagnostics": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
                 }
               ],
               "detection_log": [],
@@ -7089,19 +7182,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2692,
                   "end_line": 2692,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7112,19 +7206,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2804,
                   "end_line": 2804,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7135,19 +7230,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2818,
                   "end_line": 2818,
-                  "from_file": "fusiondirectory/debian/copyright.in",
-                  "matched_length": 5,
-                  "match_coverage": 100.0,
                   "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
+                  "score": 100.0,
+                  "matched_length": 5,
+                  "match_coverage": 100.0,
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7158,19 +7254,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2844,
                   "end_line": 2844,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7181,19 +7278,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2863,
                   "end_line": 2863,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7204,19 +7302,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2873,
                   "end_line": 2873,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7227,19 +7326,20 @@
               "license_expression_spdx": "BSD-2-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-simplified",
+                  "spdx_license_expression": "BSD-2-Clause",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2880,
                   "end_line": 2880,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-simplified",
-                  "spdx_license_expression": "BSD-2-Clause",
-                  "rule_identifier": "bsd-simplified_136.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-simplified_136.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
-                  "matched_text": "License: BSD (2 clause)"
+                  "matched_text": "License: BSD (2 clause)",
+                  "matched_text_diagnostics": "License: BSD (2 clause)"
                 }
               ],
               "detection_log": [],
@@ -7250,19 +7350,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2889,
                   "end_line": 2889,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later) ("
+                  "matched_text": "License: GPL (v2 or later) (with incorrect FSF address)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later) ("
                 }
               ],
               "detection_log": [],
@@ -7273,19 +7374,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2903,
                   "end_line": 2903,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7296,19 +7398,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2911,
                   "end_line": 2911,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7319,19 +7422,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2919,
                   "end_line": 2919,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7342,19 +7446,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2939,
                   "end_line": 2939,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7365,19 +7470,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2945,
                   "end_line": 2945,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7388,19 +7494,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2951,
                   "end_line": 2951,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7411,19 +7518,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2959,
                   "end_line": 2959,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7434,19 +7542,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2964,
                   "end_line": 2964,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7457,19 +7566,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2970,
                   "end_line": 2970,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7480,19 +7590,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2976,
                   "end_line": 2976,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7503,19 +7614,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2982,
                   "end_line": 2982,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7526,19 +7638,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2988,
                   "end_line": 2988,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7549,19 +7662,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2993,
                   "end_line": 2993,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -7572,19 +7686,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 2999,
                   "end_line": 2999,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later) ("
+                  "matched_text": "License: GPL (v2 or later) (with incorrect FSF address)",
+                  "matched_text_diagnostics": "License: GPL (v2 or later) ("
                 }
               ],
               "detection_log": [],
@@ -7595,19 +7710,20 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": "fusiondirectory/debian/copyright.in",
                   "start_line": 3005,
                   "end_line": 3005,
-                  "from_file": "fusiondirectory/debian/copyright.in",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_687.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-                  "matched_text": "License: GPL (v2 or later)"
+                  "matched_text": "License: GPL (v2 or later) GENERATED FILE",
+                  "matched_text_diagnostics": "License: GPL (v2 or later)"
                 }
               ],
               "detection_log": [],
@@ -12209,19 +12325,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 297,
               "end_line": 297,
-              "from_file": "fusiondirectory/debian/copyright",
-              "matched_length": 3,
-              "match_coverage": 100.0,
               "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
+              "score": 100.0,
+              "matched_length": 3,
+              "match_coverage": 100.0,
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12232,34 +12349,36 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 411,
               "end_line": 411,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 413,
               "end_line": 413,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": " This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             }
           ],
           "detection_log": [],
@@ -12270,19 +12389,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 427,
               "end_line": 427,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12293,19 +12413,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 433,
               "end_line": 433,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12316,19 +12437,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 441,
               "end_line": 441,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_195.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_195.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-              "matched_text": "License: BSD-3-clause"
+              "matched_text": "License: BSD-3-clause",
+              "matched_text_diagnostics": "License: BSD-3-clause"
             }
           ],
           "detection_log": [],
@@ -12339,19 +12461,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 452,
               "end_line": 452,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12362,19 +12485,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 461,
               "end_line": 461,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12385,19 +12509,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 475,
               "end_line": 475,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12408,19 +12533,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 488,
               "end_line": 488,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12431,19 +12557,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 495,
               "end_line": 495,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12454,19 +12581,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 503,
               "end_line": 503,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [],
@@ -12477,34 +12605,36 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 560,
               "end_line": 560,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 562,
               "end_line": 562,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-              "matched_text": "This file is distributed under the same license as the"
+              "matched_text": " This file is distributed under the same license as the fusiondirectory package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the"
             }
           ],
           "detection_log": [],
@@ -12515,19 +12645,20 @@
           "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 968,
               "end_line": 968,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "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+"
+              "matched_text": "License: LGPL-3+",
+              "matched_text_diagnostics": "License: LGPL-3+"
             }
           ],
           "detection_log": [],
@@ -12538,19 +12669,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1094,
               "end_line": 1094,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "pypi_public_domain.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_public_domain.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-              "matched_text": "License: public-domain"
+              "matched_text": "License: public-domain",
+              "matched_text_diagnostics": "License: public-domain"
             }
           ],
           "detection_log": [
@@ -12564,19 +12696,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1099,
               "end_line": 1099,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_67.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_67.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_67.RULE",
-              "matched_text": "GPL-2+)."
+              "matched_text": "  FusionDirectory (i.e. GPL-2+).",
+              "matched_text_diagnostics": "GPL-2+)."
             }
           ],
           "detection_log": [
@@ -12590,19 +12723,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1413,
               "end_line": 1413,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12616,19 +12750,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1423,
               "end_line": 1423,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12642,19 +12777,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1429,
               "end_line": 1429,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_437.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-              "matched_text": "License: Expat"
+              "matched_text": "License: Expat",
+              "matched_text_diagnostics": "License: Expat"
             }
           ],
           "detection_log": [
@@ -12668,19 +12804,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1437,
               "end_line": 1437,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12694,19 +12831,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1443,
               "end_line": 1443,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12720,19 +12858,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1449,
               "end_line": 1449,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12746,19 +12885,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1457,
               "end_line": 1457,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12772,19 +12912,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1463,
               "end_line": 1463,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12798,19 +12939,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1469,
               "end_line": 1469,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12824,19 +12966,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1475,
               "end_line": 1475,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12850,19 +12993,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1481,
               "end_line": 1481,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12876,19 +13020,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1487,
               "end_line": 1487,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12902,19 +13047,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1493,
               "end_line": 1493,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             }
           ],
           "detection_log": [
@@ -12928,19 +13074,20 @@
           "license_expression_spdx": "BSD-4-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1501,
               "end_line": 1501,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original",
-              "spdx_license_expression": "BSD-4-Clause",
-              "rule_identifier": "bsd-original_43.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original_43.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-              "matched_text": "License: BSD-4-clause"
+              "matched_text": "License: BSD-4-clause",
+              "matched_text_diagnostics": "License: BSD-4-clause"
             }
           ],
           "detection_log": [],
@@ -12951,19 +13098,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1507,
               "end_line": 1507,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_437.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-              "matched_text": "License: Expat"
+              "matched_text": "License: Expat",
+              "matched_text_diagnostics": "License: Expat"
             }
           ],
           "detection_log": [
@@ -12977,19 +13125,20 @@
           "license_expression_spdx": null,
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1513,
               "end_line": 1513,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_437.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-              "matched_text": "License: Expat"
+              "matched_text": "License: Expat",
+              "matched_text_diagnostics": "License: Expat"
             }
           ],
           "detection_log": [
@@ -13003,334 +13152,356 @@
           "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "License: GPL-2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_89.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE",
-              "matched_text": "GPL-3+"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "GPL-3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_64.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_64.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_64.RULE",
-              "matched_text": "LGPL-2.1+"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "LGPL-2.1+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_36.RULE",
-              "matched_text": "LGPL-3+"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "LGPL-3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
-              "matched_text": "BSD-3-clause"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "BSD-3-clause"
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1521,
               "end_line": 1521,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original",
-              "spdx_license_expression": "BSD-4-Clause",
-              "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
-              "matched_text": "BSD-4-clause"
+              "matched_text": "License: GPL-2+ or GPL-3+ or LGPL-2.1+ or LGPL-3+ or Expat or BSD-3-clause or BSD-4-clause",
+              "matched_text_diagnostics": "BSD-4-clause"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1523,
               "end_line": 1523,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_22.RULE",
               "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+"
+              "matched_text": "License: GPL-2+",
+              "matched_text_diagnostics": "License: GPL-2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1524,
               "end_line": 1539,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 136,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_1038.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_1038.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_1038.RULE",
-              "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
+              "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.",
+              "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 2 can be found in `/usr/share/common-licenses/GPL-2'."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1541,
               "end_line": 1541,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_92.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_92.RULE",
               "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+"
+              "matched_text": "License: GPL-3+",
+              "matched_text_diagnostics": "License: GPL-3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1542,
               "end_line": 1557,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 136,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_512.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_512.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_512.RULE",
-              "matched_text": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
+              "matched_text": " This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.",
+              "matched_text_diagnostics": "This package is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n .\n This package is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n GNU General Public License for more details.\n .\n You should have received a copy of the GNU General Public License\n along with this package; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n .\n On Debian systems, the complete text of the GNU General\n Public License 3 can be found in `/usr/share/common-licenses/GPL-3'."
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1559,
               "end_line": 1559,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "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+"
+              "matched_text": "License: LGPL-2.1+",
+              "matched_text_diagnostics": "License: LGPL-2.1+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1560,
               "end_line": 1577,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 146,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_418.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_418.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_418.RULE",
-              "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
+              "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'.",
+              "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 2.1 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n You should have received a copy of the GNU Lesser General Public\n License along with this library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n MA  02110-1301  USA\n .\n On Debian systems, the full text of the GNU Lesser General Public\n License version 2,1 can be found in the file\n `/usr/share/common-licenses/LGPL-2.1'."
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1579,
               "end_line": 1579,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_437.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_437.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE",
-              "matched_text": "License: Expat"
+              "matched_text": "License: Expat",
+              "matched_text_diagnostics": "License: Expat"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1580,
               "end_line": 1596,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-              "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
+              "matched_text": " Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE.",
+              "matched_text_diagnostics": "Permission is hereby granted, free of charge, to any person obtaining a copy of\n this software and associated documentation files (the \"Software\"), to deal in\n the Software without restriction, including without limitation the rights to\n use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n of the Software, and to permit persons to whom the Software is furnished to do\n so, subject to the following conditions:\n .\n The above copyright notice and this permission notice shall be included in all\n copies or substantial portions of the Software.\n .\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n SOFTWARE."
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1598,
               "end_line": 1598,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_195.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_195.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE",
-              "matched_text": "License: BSD-3-clause"
+              "matched_text": "License: BSD-3-clause",
+              "matched_text_diagnostics": "License: BSD-3-clause"
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1599,
               "end_line": 1621,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 213,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_577.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_577.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_577.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - Neither the name of the copyright holder nor the names of its contributors\n     may be used to endorse or promote products derived from this software\n     without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  OR BUSINESS\n INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1623,
               "end_line": 1623,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original",
-              "spdx_license_expression": "BSD-4-Clause",
-              "rule_identifier": "bsd-original_43.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original_43.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_43.RULE",
-              "matched_text": "License: BSD-4-clause"
+              "matched_text": "License: BSD-4-clause",
+              "matched_text_diagnostics": "License: BSD-4-clause"
             },
             {
-              "score": 100.0,
+              "license_expression": "bsd-original",
+              "spdx_license_expression": "BSD-4-Clause",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1624,
               "end_line": 1649,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 236,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original",
-              "spdx_license_expression": "BSD-4-Clause",
-              "rule_identifier": "bsd-original_71.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original_71.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original_71.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              "matched_text": " Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions\n are met:\n .\n   - Redistributions of source code must retain the above copyright notice,\n     this list of conditions and the following disclaimer.\n   - Redistributions in binary form must reproduce the above copyright notice,\n     this list of conditions and the following disclaimer in the documentation\n     and/or other materials provided with the distribution.\n   - All advertising materials mentioning features or use of this software must\n     display the following acknowledgement: \u201cThis product includes software\n     developed by the .\u201d\n   - Neither the name of the author(s) nor the names of this program's\n     contributors may be used to endorse or promote products derived from this\n     software without specific prior written permission.\n .\n THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) \u201cAS IS\u201d AND ANY EXPRESS OR IMPLIED\n WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1651,
               "end_line": 1651,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_166.RULE",
               "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+"
+              "matched_text": "License: LGPL-3+",
+              "matched_text_diagnostics": "License: LGPL-3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1652,
               "end_line": 1663,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 105,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_189.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_189.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_189.RULE",
-              "matched_text": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
+              "matched_text": " This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'.",
+              "matched_text_diagnostics": "This library is free software; you can redistribute it and/or\n modify it under the terms of the GNU Lesser General Public\n License as published by the Free Software Foundation; either\n version 3 of the License, or (at your option) any later version.\n .\n This library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n Lesser General Public License for more details.\n .\n On Debian systems, the complete text of the GNU Lesser General\n Public License 3 can be found in `/usr/share/common-licenses/LGPL-3'."
             },
             {
-              "score": 99.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1665,
               "end_line": 1665,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "pypi_public_domain.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_public_domain.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-              "matched_text": "License: public-domain"
+              "matched_text": "License: public-domain",
+              "matched_text_diagnostics": "License: public-domain"
             },
             {
-              "score": 100.0,
+              "license_expression": "other-permissive",
+              "spdx_license_expression": "LicenseRef-scancode-other-permissive",
+              "from_file": "fusiondirectory/debian/copyright",
               "start_line": 1666,
               "end_line": 1669,
-              "from_file": "fusiondirectory/debian/copyright",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 40,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "other-permissive",
-              "spdx_license_expression": "LicenseRef-scancode-other-permissive",
-              "rule_identifier": "other-permissive_325.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "other-permissive_325.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_325.RULE",
-              "matched_text": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
+              "matched_text": " This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any).",
+              "matched_text_diagnostics": "This file is in the public domain.  You may use and modify it as\n you see fit, as long as this copyright message is included and\n that there is an indication as to what modifications have been\n made (if any)."
             }
           ],
           "detection_log": [],
@@ -13454,19 +13625,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2692,
               "end_line": 2692,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13477,19 +13649,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2804,
               "end_line": 2804,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13500,19 +13673,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2818,
               "end_line": 2818,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13523,19 +13697,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2844,
               "end_line": 2844,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13546,19 +13721,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2863,
               "end_line": 2863,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13569,19 +13745,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2873,
               "end_line": 2873,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13592,19 +13769,20 @@
           "license_expression_spdx": "BSD-2-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-simplified",
+              "spdx_license_expression": "BSD-2-Clause",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2880,
               "end_line": 2880,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-simplified",
-              "spdx_license_expression": "BSD-2-Clause",
-              "rule_identifier": "bsd-simplified_136.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-simplified_136.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_136.RULE",
-              "matched_text": "License: BSD (2 clause)"
+              "matched_text": "License: BSD (2 clause)",
+              "matched_text_diagnostics": "License: BSD (2 clause)"
             }
           ],
           "detection_log": [],
@@ -13615,19 +13793,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2889,
               "end_line": 2889,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later) ("
+              "matched_text": "License: GPL (v2 or later) (with incorrect FSF address)",
+              "matched_text_diagnostics": "License: GPL (v2 or later) ("
             }
           ],
           "detection_log": [],
@@ -13638,19 +13817,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2903,
               "end_line": 2903,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13661,19 +13841,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2911,
               "end_line": 2911,
-              "from_file": "fusiondirectory/debian/copyright.in",
-              "matched_length": 5,
-              "match_coverage": 100.0,
               "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
+              "score": 100.0,
+              "matched_length": 5,
+              "match_coverage": 100.0,
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13684,19 +13865,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2919,
               "end_line": 2919,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13707,19 +13889,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2939,
               "end_line": 2939,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13730,19 +13913,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2945,
               "end_line": 2945,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13753,19 +13937,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2951,
               "end_line": 2951,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13776,19 +13961,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2959,
               "end_line": 2959,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13799,19 +13985,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2964,
               "end_line": 2964,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13822,19 +14009,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2970,
               "end_line": 2970,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13845,19 +14033,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2976,
               "end_line": 2976,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13868,19 +14057,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2982,
               "end_line": 2982,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13891,19 +14081,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2988,
               "end_line": 2988,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13914,19 +14105,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2993,
               "end_line": 2993,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later)",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13937,19 +14129,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 2999,
               "end_line": 2999,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later) ("
+              "matched_text": "License: GPL (v2 or later) (with incorrect FSF address)",
+              "matched_text_diagnostics": "License: GPL (v2 or later) ("
             }
           ],
           "detection_log": [],
@@ -13960,19 +14153,20 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "fusiondirectory/debian/copyright.in",
               "start_line": 3005,
               "end_line": 3005,
-              "from_file": "fusiondirectory/debian/copyright.in",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_687.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_687.RULE",
-              "matched_text": "License: GPL (v2 or later)"
+              "matched_text": "License: GPL (v2 or later) GENERATED FILE",
+              "matched_text_diagnostics": "License: GPL (v2 or later)"
             }
           ],
           "detection_log": [],
@@ -13981,94 +14175,100 @@
       ],
       "license_clues": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "spdx_license_expression": "LGPL-3.0-only",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 2925,
           "end_line": 2925,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "spdx_license_expression": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_37.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0_37.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_37.RULE",
-          "matched_text": "License: LGPL (v3"
+          "matched_text": "License: LGPL (v3 or later)",
+          "matched_text_diagnostics": "License: LGPL (v3"
         },
         {
-          "score": 90.0,
+          "license_expression": "mit",
+          "spdx_license_expression": "MIT",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 3010,
           "end_line": 3010,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 90.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "spdx_license_expression": "MIT",
-          "rule_identifier": "mit_221.RULE",
           "rule_relevance": 90,
+          "rule_identifier": "mit_221.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_221.RULE",
-          "matched_text": "License: MIT/X11 ("
+          "matched_text": "License: MIT/X11 (BSD like)",
+          "matched_text_diagnostics": "License: MIT/X11 ("
         },
         {
-          "score": 100.0,
+          "license_expression": "other-permissive",
+          "spdx_license_expression": "LicenseRef-scancode-other-permissive",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 3010,
           "end_line": 3010,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "other-permissive",
-          "spdx_license_expression": "LicenseRef-scancode-other-permissive",
-          "rule_identifier": "other-permissive_16.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "other-permissive_16.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_16.RULE",
-          "matched_text": "BSD like)"
+          "matched_text": "License: MIT/X11 (BSD like)",
+          "matched_text_diagnostics": "BSD like)"
         },
         {
-          "score": 99.0,
+          "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 3016,
           "end_line": 3016,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "public-domain",
-          "spdx_license_expression": "LicenseRef-scancode-public-domain",
-          "rule_identifier": "pypi_public_domain.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_public_domain.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_public_domain.RULE",
-          "matched_text": "License: Public domain"
+          "matched_text": "License: Public domain BSD (4 clause) GPL",
+          "matched_text_diagnostics": "License: Public domain"
         },
         {
-          "score": 100.0,
+          "license_expression": "bsd-original",
+          "spdx_license_expression": "BSD-4-Clause",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 3016,
           "end_line": 3016,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original",
-          "spdx_license_expression": "BSD-4-Clause",
-          "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_bsd-4-clause_for_bsd-original.RULE",
-          "matched_text": "BSD (4 clause)"
+          "matched_text": "License: Public domain BSD (4 clause) GPL",
+          "matched_text_diagnostics": "BSD (4 clause)"
         },
         {
-          "score": 50.0,
+          "license_expression": "gpl-1.0-plus",
+          "spdx_license_expression": "GPL-1.0-or-later",
+          "from_file": "fusiondirectory/debian/copyright.in",
           "start_line": 3016,
           "end_line": 3016,
-          "from_file": "fusiondirectory/debian/copyright.in",
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "spdx_license_expression": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_relevance": 50,
+          "rule_identifier": "gpl_bare_word_only.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
-          "matched_text": "GPL"
+          "matched_text": "License: Public domain BSD (4 clause) GPL",
+          "matched_text_diagnostics": "GPL"
         }
       ],
       "percentage_of_license_text": 0.66,
@@ -14299,19 +14499,20 @@
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "fusiondirectory/debian/po/de.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "fusiondirectory/debian/po/de.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-              "matched_text": "This file is distributed under the same license as the"
+              "matched_text": "# This file is distributed under the same license as the fusiondirectory package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the"
             }
           ],
           "detection_log": [],
@@ -14435,19 +14636,20 @@
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "fusiondirectory/debian/po/fr.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "fusiondirectory/debian/po/fr.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_1.RULE",
-              "matched_text": "This file is distributed under the same license as the package."
+              "matched_text": "# This file is distributed under the same license as the package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the package."
             }
           ],
           "detection_log": [],
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 cef7ee9ca94..35a620740b6 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
@@ -52,17 +52,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -147,17 +147,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.3/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -197,19 +197,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 5.88,
+          "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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,
+          "matcher": "3-seq",
+          "score": 5.88,
           "matched_length": 5,
           "match_coverage": 5.88,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
-          "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
-          "matched_text": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
+          "matched_text": "include django/contrib/gis/geos/LICENSE\ninclude django/dispatch/license.txt\ninclude django/utils/simplejson/LICENSE.txt",
+          "matched_text_diagnostics": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
         }
       ]
     },
@@ -221,19 +222,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "google_appengine_sdk/django-1.2/setup.py",
           "start_line": 89,
           "end_line": 89,
+          "matcher": "2-aho",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-          "matched_text": "License :: OSI Approved :: BSD License',"
+          "matched_text": "                   'License :: OSI Approved :: BSD License',",
+          "matched_text_diagnostics": "License :: OSI Approved :: BSD License',"
         }
       ]
     },
@@ -247,32 +249,33 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_3.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_3.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-          "matched_text": "This file is distributed under the same license as the Django package."
+          "matched_text": "# This file is distributed under the same license as the Django package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
         },
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "django-1.2/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
           "matched_text": "- 'License :: OSI Approved :: BSD License'"
         }
@@ -286,19 +289,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "google_appengine_sdk/django-1.3/LICENSE",
           "start_line": 4,
           "end_line": 27,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 214,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "bsd-new_683.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "bsd-new_683.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
-          "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+          "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
         }
       ]
     },
@@ -312,32 +316,33 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 99.0,
+          "license_expression": "bsd-new",
+          "license_expression_spdx": "BSD-3-Clause",
           "from_file": "django-1.2/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 99.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "bsd-new",
-          "license_expression_spdx": "BSD-3-Clause",
-          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_relevance": 99,
+          "rule_identifier": "pypi_bsd_license.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
           "matched_text": "- 'License :: OSI Approved :: BSD License'"
         }
@@ -400,19 +405,20 @@
           "license_expression_spdx": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license",
           "matches": [
             {
-              "score": 5.88,
+              "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",
+              "from_file": "google_appengine_sdk/django-1.2/MANIFEST.in",
               "start_line": 7,
               "end_line": 9,
-              "from_file": "google_appengine_sdk/django-1.2/MANIFEST.in",
+              "matcher": "3-seq",
+              "score": 5.88,
               "matched_length": 5,
               "match_coverage": 5.88,
-              "matcher": "3-seq",
-              "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",
-              "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
-              "matched_text": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
+              "matched_text": "include django/contrib/gis/geos/LICENSE\ninclude django/dispatch/license.txt\ninclude django/utils/simplejson/LICENSE.txt",
+              "matched_text_diagnostics": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
             }
           ],
           "detection_log": [],
@@ -526,32 +532,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "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,
-              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/LC_MESSAGES/djangojs.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-              "matched_text": "This file is distributed under the same license as the Django package."
+              "matched_text": "# This file is distributed under the same license as the Django package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -581,32 +588,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-              "matched_text": "This file is distributed under the same license as the Django package."
+              "matched_text": "# This file is distributed under the same license as the Django package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -660,32 +668,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "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,
-              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/django.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -715,32 +724,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "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,
-              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/djangojs.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -770,32 +780,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/formats.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/formats.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-              "matched_text": "This file is distributed under the same license as the Django package."
+              "matched_text": "# This file is distributed under the same license as the Django package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.2/setup.py",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -923,17 +934,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google_appengine_sdk/django-1.2/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "google_appengine_sdk/django-1.2/setup.py",
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -970,19 +981,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 89,
               "end_line": 89,
-              "from_file": "google_appengine_sdk/django-1.2/setup.py",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-              "matched_text": "License :: OSI Approved :: BSD License',"
+              "matched_text": "                   'License :: OSI Approved :: BSD License',",
+              "matched_text_diagnostics": "License :: OSI Approved :: BSD License',"
             }
           ],
           "detection_log": [],
@@ -1048,19 +1060,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google_appengine_sdk/django-1.3/LICENSE",
               "start_line": 4,
               "end_line": 27,
-              "from_file": "google_appengine_sdk/django-1.3/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 214,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_683.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_683.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
-              "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+              "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
             }
           ],
           "detection_log": [],
@@ -1086,19 +1099,20 @@
           "license_expression_spdx": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license",
           "matches": [
             {
-              "score": 5.88,
+              "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",
+              "from_file": "google_appengine_sdk/django-1.3/MANIFEST.in",
               "start_line": 7,
               "end_line": 9,
-              "from_file": "google_appengine_sdk/django-1.3/MANIFEST.in",
+              "matcher": "3-seq",
+              "score": 5.88,
               "matched_length": 5,
               "match_coverage": 5.88,
-              "matcher": "3-seq",
-              "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",
-              "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_and_cc-by-nc-nd-3.0_and_other-permissive_and_proprietary-license_1.RULE",
-              "matched_text": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
+              "matched_text": "include django/contrib/gis/geos/LICENSE\ninclude django/dispatch/license.txt\ninclude django/utils/simplejson/LICENSE.txt",
+              "matched_text_diagnostics": "LICENSE\n[include] [django]/[dispatch]/license.txt\n[include] [django]/[utils]/[simplejson]/LICENSE.txt"
             }
           ],
           "detection_log": [],
@@ -1183,17 +1197,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -1230,19 +1244,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
               "start_line": 16,
               "end_line": 16,
-              "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-              "matched_text": "License :: OSI Approved :: BSD License"
+              "matched_text": "Classifier: License :: OSI Approved :: BSD License",
+              "matched_text_diagnostics": "License :: OSI Approved :: BSD License"
             }
           ],
           "detection_log": [],
@@ -1354,32 +1369,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "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,
-              "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-              "matched_text": "This file is distributed under the same license as the Django package."
+              "matched_text": "# This file is distributed under the same license as the Django package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.3/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -1433,32 +1449,33 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "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,
-              "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/uk/LC_MESSAGES/django.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_3.RULE",
-              "matched_text": "This file is distributed under the same license as the Django package."
+              "matched_text": "# This file is distributed under the same license as the Django package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the Django package."
             },
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "django-1.3/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -1509,19 +1526,20 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google_appengine_sdk/django-1.3/LICENSE",
                   "start_line": 4,
                   "end_line": 27,
-                  "from_file": "google_appengine_sdk/django-1.3/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 214,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_683.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_683.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_683.RULE",
-                  "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+                  "matched_text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+                  "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n    1. Redistributions of source code must retain the above copyright notice, \n       this list of conditions and the following disclaimer.\n    \n    2. Redistributions in binary form must reproduce the above copyright \n       notice, this list of conditions and the following disclaimer in the\n       documentation and/or other materials provided with the distribution.\n\n    3. Neither the name of Django nor the names of its contributors may be used\n       to endorse or promote products derived from this software without\n       specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
                 }
               ],
               "detection_log": [],
@@ -1614,17 +1632,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "google_appengine_sdk/django-1.3/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "google_appengine_sdk/django-1.3/setup.py",
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -1661,19 +1679,20 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "google_appengine_sdk/django-1.3/setup.py",
               "start_line": 89,
               "end_line": 89,
-              "from_file": "google_appengine_sdk/django-1.3/setup.py",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
-              "matched_text": "License :: OSI Approved :: BSD License',"
+              "matched_text": "                   'License :: OSI Approved :: BSD License',",
+              "matched_text_diagnostics": "License :: OSI Approved :: BSD License',"
             }
           ],
           "detection_log": [],
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 d830da8e677..5924b7d8e53 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
@@ -46,17 +46,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache 2.0"
             }
@@ -68,17 +68,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 95.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
               "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
             }
@@ -399,47 +399,48 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-          "matched_text": "This file is distributed under the same license as the"
+          "matched_text": "# This file is distributed under the same license as the PaddleNLP package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the"
         },
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "matched_text": "Apache 2.0"
         },
         {
-          "score": 95.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 95.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
+          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
           "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
         }
@@ -453,19 +454,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 66.67,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/README.md",
           "start_line": 305,
           "end_line": 307,
+          "matcher": "2-aho",
+          "score": 66.67,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1215.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_1215.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
-          "matched_text": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
+          "matched_text": "License\n\nPaddleNLP\u9075\u5faa[Apache-2.0\u5f00\u6e90\u534f\u8bae](./LICENSE)\u3002",
+          "matched_text_diagnostics": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
         }
       ]
     },
@@ -479,34 +481,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/README_en.md",
           "start_line": 221,
           "end_line": 221,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_83.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_83.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
-          "matched_text": "is provided under the [Apache-2.0 License](./LICENSE)."
+          "matched_text": "is provided under the [Apache-2.0 License](./LICENSE).",
+          "matched_text_diagnostics": "is provided under the [Apache-2.0 License](./LICENSE)."
         },
         {
-          "score": 99.81,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/LICENSE",
           "start_line": 3,
           "end_line": 203,
+          "matcher": "3-seq",
+          "score": 99.81,
           "matched_length": 1582,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_164.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_164.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-          "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+          "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+          "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
         }
       ]
     },
@@ -518,19 +522,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 99.81,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/LICENSE",
           "start_line": 3,
           "end_line": 203,
+          "matcher": "3-seq",
+          "score": 99.81,
           "matched_length": 1582,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_164.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_164.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-          "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+          "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+          "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
         }
       ]
     },
@@ -542,19 +547,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 74.36,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/setup.py",
           "start_line": 1,
           "end_line": 13,
+          "matcher": "3-seq",
+          "score": 74.36,
           "matched_length": 87,
           "match_coverage": 74.36,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1297.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_1297.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1297.RULE",
-          "matched_text": "All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this [file] except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+          "matched_text": "# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.",
+          "matched_text_diagnostics": "All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this [file] except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
         }
       ]
     },
@@ -566,19 +572,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/hubconf.py",
           "start_line": 3,
           "end_line": 13,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 85,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_7.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
-          "matched_text": "Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+          "matched_text": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.",
+          "matched_text_diagnostics": "Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
         }
       ]
     },
@@ -590,17 +597,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "matched_text": "Apache 2.0"
         }
@@ -614,34 +621,36 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 95.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/setup.py",
           "start_line": 75,
           "end_line": 75,
+          "matcher": "2-aho",
+          "score": 95.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
+          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
-          "matched_text": "License :: OSI Approved :: Apache Software License',"
+          "matched_text": "        'License :: OSI Approved :: Apache Software License',",
+          "matched_text_diagnostics": "License :: OSI Approved :: Apache Software License',"
         },
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/setup.py",
           "start_line": 78,
           "end_line": 78,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "apache-2.0_65.RULE",
           "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')"
+          "matched_text": "    license='Apache 2.0')",
+          "matched_text_diagnostics": "license='Apache 2.0')"
         }
       ]
     },
@@ -653,17 +662,17 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 95.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "paddlenlp/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 95.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_relevance": 95,
+          "rule_identifier": "pypi_apache_no-version.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
           "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
         }
@@ -686,19 +695,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 99.81,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/LICENSE",
               "start_line": 3,
               "end_line": 203,
-              "from_file": "paddlenlp/LICENSE",
+              "matcher": "3-seq",
+              "score": 99.81,
               "matched_length": 1582,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_164.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_164.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-              "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+              "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+              "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
             }
           ],
           "detection_log": [],
@@ -724,19 +734,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 66.67,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/README.md",
               "start_line": 305,
               "end_line": 307,
-              "from_file": "paddlenlp/README.md",
+              "matcher": "2-aho",
+              "score": 66.67,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1215.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1215.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
-              "matched_text": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
+              "matched_text": "License\n\nPaddleNLP\u9075\u5faa[Apache-2.0\u5f00\u6e90\u534f\u8bae](./LICENSE)\u3002",
+              "matched_text_diagnostics": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
             }
           ],
           "detection_log": [],
@@ -762,34 +773,36 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/README_en.md",
               "start_line": 221,
               "end_line": 221,
-              "from_file": "paddlenlp/README_en.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_83.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_83.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
-              "matched_text": "is provided under the [Apache-2.0 License](./LICENSE)."
+              "matched_text": "is provided under the [Apache-2.0 License](./LICENSE).",
+              "matched_text_diagnostics": "is provided under the [Apache-2.0 License](./LICENSE)."
             },
             {
-              "score": 99.81,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/LICENSE",
               "start_line": 3,
               "end_line": 203,
-              "from_file": "paddlenlp/LICENSE",
+              "matcher": "3-seq",
+              "score": 99.81,
               "matched_length": 1582,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_164.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_164.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-              "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+              "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+              "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
             }
           ],
           "detection_log": [
@@ -865,47 +878,48 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-              "matched_text": "This file is distributed under the same license as the"
+              "matched_text": "# This file is distributed under the same license as the PaddleNLP package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache 2.0"
             },
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 95.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
               "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
             }
@@ -935,47 +949,48 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/data.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/data.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-              "matched_text": "This file is distributed under the same license as the"
+              "matched_text": "# This file is distributed under the same license as the PaddleNLP package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache 2.0"
             },
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.py",
+              "matcher": "1-hash",
+              "score": 95.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
               "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
             }
@@ -1210,19 +1225,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/hubconf.py",
               "start_line": 3,
               "end_line": 13,
-              "from_file": "paddlenlp/hubconf.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 85,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
-              "matched_text": "Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+              "matched_text": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.",
+              "matched_text_diagnostics": "Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
             }
           ],
           "detection_log": [],
@@ -1269,19 +1285,20 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 99.81,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/LICENSE",
                   "start_line": 3,
                   "end_line": 203,
-                  "from_file": "paddlenlp/LICENSE",
+                  "matcher": "3-seq",
+                  "score": 99.81,
                   "matched_length": 1582,
                   "match_coverage": 100.0,
-                  "matcher": "3-seq",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_164.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_164.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-                  "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+                  "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+                  "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
                 }
               ],
               "detection_log": [],
@@ -1292,19 +1309,20 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 66.67,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/README.md",
                   "start_line": 305,
                   "end_line": 307,
-                  "from_file": "paddlenlp/README.md",
+                  "matcher": "2-aho",
+                  "score": 66.67,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_1215.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_1215.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1215.RULE",
-                  "matched_text": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
+                  "matched_text": "License\n\nPaddleNLP\u9075\u5faa[Apache-2.0\u5f00\u6e90\u534f\u8bae](./LICENSE)\u3002",
+                  "matched_text_diagnostics": "License\n\n[PaddleNLP\u9075\u5faa][Apache-2.[0\u5f00\u6e90\u534f\u8bae]](./LICENSE)\u3002"
                 }
               ],
               "detection_log": [],
@@ -1315,34 +1333,36 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/README_en.md",
                   "start_line": 221,
                   "end_line": 221,
-                  "from_file": "paddlenlp/README_en.md",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_83.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_83.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_83.RULE",
-                  "matched_text": "is provided under the [Apache-2.0 License](./LICENSE)."
+                  "matched_text": "is provided under the [Apache-2.0 License](./LICENSE).",
+                  "matched_text_diagnostics": "is provided under the [Apache-2.0 License](./LICENSE)."
                 },
                 {
-                  "score": 99.81,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/LICENSE",
                   "start_line": 3,
                   "end_line": 203,
-                  "from_file": "paddlenlp/LICENSE",
+                  "matcher": "3-seq",
+                  "score": 99.81,
                   "matched_length": 1582,
                   "match_coverage": 100.0,
-                  "matcher": "3-seq",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_164.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_164.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_164.RULE",
-                  "matched_text": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
+                  "matched_text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+                  "matched_text_diagnostics": "Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright ([c]) [2016] [PaddlePaddle] [Authors]. All Rights Reserved.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
                 }
               ],
               "detection_log": [
@@ -1638,17 +1658,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "paddlenlp/setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "Apache 2.0"
                 }
@@ -1660,17 +1680,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 95.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "paddlenlp/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "paddlenlp/setup.py",
+                  "matcher": "1-hash",
+                  "score": 95.0,
                   "matched_length": 6,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "pypi_apache_no-version.RULE",
                   "rule_relevance": 95,
+                  "rule_identifier": "pypi_apache_no-version.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
                   "matched_text": "- 'License :: OSI Approved :: Apache Software License'"
                 }
@@ -1728,19 +1748,20 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 74.36,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 13,
-              "from_file": "paddlenlp/setup.py",
+              "matcher": "3-seq",
+              "score": 74.36,
               "matched_length": 87,
               "match_coverage": 74.36,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1297.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1297.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1297.RULE",
-              "matched_text": "All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this [file] except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
+              "matched_text": "# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.",
+              "matched_text_diagnostics": "All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this [file] except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#     http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License."
             }
           ],
           "detection_log": [],
@@ -1751,34 +1772,36 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 75,
               "end_line": 75,
-              "from_file": "paddlenlp/setup.py",
+              "matcher": "2-aho",
+              "score": 95.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "pypi_apache_no-version.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_apache_no-version.RULE",
-              "matched_text": "License :: OSI Approved :: Apache Software License',"
+              "matched_text": "        'License :: OSI Approved :: Apache Software License',",
+              "matched_text_diagnostics": "License :: OSI Approved :: Apache Software License',"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 78,
               "end_line": 78,
-              "from_file": "paddlenlp/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "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')"
+              "matched_text": "    license='Apache 2.0')",
+              "matched_text_diagnostics": "license='Apache 2.0')"
             }
           ],
           "detection_log": [],
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 372a0a08b71..40c69009451 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
@@ -10,19 +10,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "physics/COPYING",
           "start_line": 2,
           "end_line": 675,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -36,109 +37,116 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 7,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 11,
           "end_line": 11,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 15,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 19,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/uk.po",
           "start_line": 23,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "physics/COPYING",
           "start_line": 2,
           "end_line": 675,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -152,124 +160,132 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 7,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 11,
           "end_line": 11,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 15,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 19,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 23,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "physics/po/en_US.po",
           "start_line": 27,
           "end_line": 27,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-          "matched_text": "This file is distributed under the same license as the PACKAGE package."
+          "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "physics/COPYING",
           "start_line": 2,
           "end_line": 675,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -281,49 +297,52 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "physics/myelements/callbacks.py",
           "start_line": 13,
           "end_line": 13,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_203.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_203.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_203.RULE",
-          "matched_text": "License:  GPLv3 |"
+          "matched_text": "License:  GPLv3 | See LICENSE for the full text",
+          "matched_text_diagnostics": "License:  GPLv3 |"
         },
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "from_file": "physics/myelements/callbacks.py",
           "start_line": 13,
           "end_line": 13,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_367.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "unknown-license-reference_367.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_367.RULE",
-          "matched_text": "See LICENSE for the full text"
+          "matched_text": "License:  GPLv3 | See LICENSE for the full text",
+          "matched_text_diagnostics": "See LICENSE for the full text"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "physics/myelements/callbacks.py",
           "start_line": 14,
           "end_line": 25,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-          "matched_text": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see ."
+          "matched_text": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see .",
+          "matched_text_diagnostics": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see ."
         }
       ]
     },
@@ -335,19 +354,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "physics/physics.py",
           "start_line": 10,
           "end_line": 21,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-          "matched_text": "This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see ."
+          "matched_text": "#  This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see .",
+          "matched_text_diagnostics": "This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see ."
         }
       ]
     }
@@ -366,19 +386,20 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "physics/COPYING",
               "start_line": 2,
               "end_line": 675,
-              "from_file": "physics/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [],
@@ -426,49 +447,52 @@
           "license_expression_spdx": "GPL-3.0-only AND LicenseRef-scancode-unknown-license-reference AND GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "physics/myelements/callbacks.py",
               "start_line": 13,
               "end_line": 13,
-              "from_file": "physics/myelements/callbacks.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_203.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_203.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_203.RULE",
-              "matched_text": "License:  GPLv3 |"
+              "matched_text": "License:  GPLv3 | See LICENSE for the full text",
+              "matched_text_diagnostics": "License:  GPLv3 |"
             },
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "physics/myelements/callbacks.py",
               "start_line": 13,
               "end_line": 13,
-              "from_file": "physics/myelements/callbacks.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_367.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_367.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_367.RULE",
-              "matched_text": "See LICENSE for the full text"
+              "matched_text": "License:  GPLv3 | See LICENSE for the full text",
+              "matched_text_diagnostics": "See LICENSE for the full text"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "physics/myelements/callbacks.py",
               "start_line": 14,
               "end_line": 25,
-              "from_file": "physics/myelements/callbacks.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-              "matched_text": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see ."
+              "matched_text": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see .",
+              "matched_text_diagnostics": "This program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program.  If not, see ."
             }
           ],
           "detection_log": [],
@@ -492,19 +516,20 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "physics/physics.py",
               "start_line": 10,
               "end_line": 21,
-              "from_file": "physics/physics.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-              "matched_text": "This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see ."
+              "matched_text": "#  This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see .",
+              "matched_text_diagnostics": "This program is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License as published by\n# the Free Software Foundation, either version 3 of the License, or\n# (at your option) any later version.\n\n# This program is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n# GNU General Public License for more details.\n\n# You should have received a copy of the GNU General Public License\n# along with this program.  If not, see ."
             }
           ],
           "detection_log": [],
@@ -540,124 +565,132 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 7,
               "end_line": 7,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 11,
               "end_line": 11,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 15,
               "end_line": 15,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 19,
               "end_line": 19,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 23,
               "end_line": 23,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/en_US.po",
               "start_line": 27,
               "end_line": 27,
-              "from_file": "physics/po/en_US.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "physics/COPYING",
               "start_line": 2,
               "end_line": 675,
-              "from_file": "physics/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [
@@ -683,109 +716,116 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 7,
               "end_line": 7,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 11,
               "end_line": 11,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 15,
               "end_line": 15,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 19,
               "end_line": 19,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "physics/po/uk.po",
               "start_line": 23,
               "end_line": 23,
-              "from_file": "physics/po/uk.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_2.RULE",
-              "matched_text": "This file is distributed under the same license as the PACKAGE package."
+              "matched_text": "# This file is distributed under the same license as the PACKAGE package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the PACKAGE package."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "physics/COPYING",
               "start_line": 2,
               "end_line": 675,
-              "from_file": "physics/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [
@@ -834,19 +874,20 @@
               "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "physics/COPYING",
                   "start_line": 2,
                   "end_line": 675,
-                  "from_file": "physics/COPYING",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5514,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+                  "matched_text": "\t\t    GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n\t\t       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\t\t\t    Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n\t\t       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n \n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n  \n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n\t\t     END OF TERMS AND CONDITIONS\n\n\t    How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
                 }
               ],
               "detection_log": [],
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 368298914ae..95d782e06ce 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
@@ -32,19 +32,20 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/COPYING",
               "start_line": 1,
               "end_line": 674,
-              "from_file": "samba/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [],
@@ -55,19 +56,20 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 63,
               "end_line": 63,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License,"
+              "matched_text": "    by me, under the GNU General Public License, in the",
+              "matched_text_diagnostics": "the GNU General Public License,"
             }
           ],
           "detection_log": [],
@@ -78,79 +80,84 @@
           "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 76,
               "end_line": 76,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-              "matched_text": "GNU GPL"
+              "matched_text": "    requirements of the GNU GPL where they are relevant.",
+              "matched_text_diagnostics": "GNU GPL"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 79,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+              "matched_text_diagnostics": "the GNU General Public License"
             },
             {
-              "score": 47.22,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 81,
-              "from_file": "samba/README.contributing",
+              "matcher": "3-seq",
+              "score": 47.22,
               "matched_length": 17,
               "match_coverage": 47.22,
-              "matcher": "3-seq",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-              "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+              "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 84,
               "end_line": 84,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-              "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 85,
               "end_line": 85,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-              "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
             }
           ],
           "detection_log": [],
@@ -161,49 +168,52 @@
           "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
           "matches": [
             {
-              "score": 75.0,
+              "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
+              "from_file": "samba/README.contributing",
               "start_line": 121,
               "end_line": 122,
-              "from_file": "samba/README.contributing",
+              "matcher": "3-seq",
+              "score": 75.0,
               "matched_length": 12,
               "match_coverage": 75.0,
-              "matcher": "3-seq",
-              "license_expression": "cc-by-sa-3.0",
-              "spdx_license_expression": "CC-BY-SA-3.0",
-              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-              "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+              "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
             },
             {
-              "score": 100.0,
+              "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
+              "from_file": "samba/README.contributing",
               "start_line": 122,
               "end_line": 122,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-sa-4.0",
-              "spdx_license_expression": "CC-BY-SA-4.0",
-              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-              "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+              "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
             },
             {
-              "score": 100.0,
+              "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
+              "from_file": "samba/README.contributing",
               "start_line": 123,
               "end_line": 123,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "dco-1.1",
-              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
-              "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "dco-1.1_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-              "matched_text": "Developer's Certificate of Origin 1.1\""
+              "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+              "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
             }
           ],
           "detection_log": [],
@@ -214,19 +224,20 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 81.82,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "samba/README.md",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "samba/README.md",
+              "matcher": "3-seq",
+              "score": 81.82,
               "matched_length": 9,
               "match_coverage": 81.82,
-              "matcher": "3-seq",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-              "matched_text": "Free Software licensed under the GNU General Public License"
+              "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+              "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
             }
           ],
           "detection_log": [],
@@ -237,19 +248,20 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.md",
               "start_line": 22,
               "end_line": 24,
-              "from_file": "samba/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 24,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+              "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
             }
           ],
           "detection_log": [],
@@ -286,49 +298,52 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 75.0,
+          "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,
+          "matcher": "3-seq",
+          "score": 75.0,
           "matched_length": 12,
           "match_coverage": 75.0,
-          "matcher": "3-seq",
-          "license_expression": "cc-by-sa-3.0",
-          "license_expression_spdx": "CC-BY-SA-3.0",
-          "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-          "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+          "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+          "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-sa-4.0",
-          "license_expression_spdx": "CC-BY-SA-4.0",
-          "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-          "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+          "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+          "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
         },
         {
-          "score": 100.0,
+          "license_expression": "dco-1.1",
+          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
           "from_file": "samba/README.contributing",
           "start_line": 123,
           "end_line": 123,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "dco-1.1",
-          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
-          "rule_identifier": "dco-1.1_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "dco-1.1_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-          "matched_text": "Developer's Certificate of Origin 1.1\""
+          "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+          "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
         }
       ]
     },
@@ -340,19 +355,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 63,
           "end_line": 63,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-          "matched_text": "the GNU General Public License,"
+          "matched_text": "    by me, under the GNU General Public License, in the",
+          "matched_text_diagnostics": "the GNU General Public License,"
         }
       ]
     },
@@ -364,79 +380,84 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 76,
           "end_line": 76,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-          "matched_text": "GNU GPL"
+          "matched_text": "    requirements of the GNU GPL where they are relevant.",
+          "matched_text_diagnostics": "GNU GPL"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 79,
           "end_line": 79,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-          "matched_text": "the GNU General Public License"
+          "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+          "matched_text_diagnostics": "the GNU General Public License"
         },
         {
-          "score": 47.22,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 79,
           "end_line": 81,
+          "matcher": "3-seq",
+          "score": 47.22,
           "matched_length": 17,
           "match_coverage": 47.22,
-          "matcher": "3-seq",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-          "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+          "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+          "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/README.contributing",
           "start_line": 84,
           "end_line": 84,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_12.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_12.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-          "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+          "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+          "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "samba/README.contributing",
           "start_line": 85,
           "end_line": 85,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-          "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+          "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+          "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
         }
       ]
     },
@@ -448,19 +469,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 81.82,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "samba/README.md",
           "start_line": 6,
           "end_line": 6,
+          "matcher": "3-seq",
+          "score": 81.82,
           "matched_length": 9,
           "match_coverage": 81.82,
-          "matcher": "3-seq",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-          "matched_text": "Free Software licensed under the GNU General Public License"
+          "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+          "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
         }
       ]
     },
@@ -472,19 +494,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/COPYING",
           "start_line": 1,
           "end_line": 674,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -498,34 +521,36 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
-          "from_file": "samba/README.md",
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
+          "from_file": "samba/README.md",
           "start_line": 22,
           "end_line": 24,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 24,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+          "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/COPYING",
           "start_line": 1,
           "end_line": 674,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -539,214 +564,228 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
           "from_file": "samba/source3/locale/net/de.po",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "license_expression_spdx": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown-package_4.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-          "matched_text": "This file is distributed under the same license as the"
+          "matched_text": "# This file is distributed under the same license as the samba package.",
+          "matched_text_diagnostics": "This file is distributed under the same license as the"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/COPYING",
           "start_line": 1,
           "end_line": 674,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 63,
           "end_line": 63,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-          "matched_text": "the GNU General Public License,"
+          "matched_text": "    by me, under the GNU General Public License, in the",
+          "matched_text_diagnostics": "the GNU General Public License,"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 76,
           "end_line": 76,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl_bare_gnu_gpl.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-          "matched_text": "GNU GPL"
+          "matched_text": "    requirements of the GNU GPL where they are relevant.",
+          "matched_text_diagnostics": "GNU GPL"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 79,
           "end_line": 79,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_33.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-          "matched_text": "the GNU General Public License"
+          "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+          "matched_text_diagnostics": "the GNU General Public License"
         },
         {
-          "score": 47.22,
+          "license_expression": "lgpl-3.0-plus",
+          "license_expression_spdx": "LGPL-3.0-or-later",
           "from_file": "samba/README.contributing",
           "start_line": 79,
           "end_line": 81,
+          "matcher": "3-seq",
+          "score": 47.22,
           "matched_length": 17,
           "match_coverage": 47.22,
-          "matcher": "3-seq",
-          "license_expression": "lgpl-3.0-plus",
-          "license_expression_spdx": "LGPL-3.0-or-later",
-          "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0-plus_103.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-          "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+          "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+          "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/README.contributing",
           "start_line": 84,
           "end_line": 84,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_12.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_12.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-          "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+          "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+          "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "license_expression_spdx": "LGPL-3.0-only",
           "from_file": "samba/README.contributing",
           "start_line": 85,
           "end_line": 85,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "license_expression_spdx": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0_1.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-          "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+          "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+          "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
         },
         {
-          "score": 75.0,
+          "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,
+          "matcher": "3-seq",
+          "score": 75.0,
           "matched_length": 12,
           "match_coverage": 75.0,
-          "matcher": "3-seq",
-          "license_expression": "cc-by-sa-3.0",
-          "license_expression_spdx": "CC-BY-SA-3.0",
-          "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "cc-by-sa-3.0_10.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-          "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+          "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+          "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-sa-4.0",
-          "license_expression_spdx": "CC-BY-SA-4.0",
-          "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "cc-by-sa-4.0_71.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-          "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+          "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+          "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
         },
         {
-          "score": 100.0,
+          "license_expression": "dco-1.1",
+          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
           "from_file": "samba/README.contributing",
           "start_line": 123,
           "end_line": 123,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "dco-1.1",
-          "license_expression_spdx": "LicenseRef-scancode-dco-1.1",
-          "rule_identifier": "dco-1.1_2.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "dco-1.1_2.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-          "matched_text": "Developer's Certificate of Origin 1.1\""
+          "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+          "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
         },
         {
-          "score": 81.82,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "samba/README.md",
           "start_line": 6,
           "end_line": 6,
+          "matcher": "3-seq",
+          "score": 81.82,
           "matched_length": 9,
           "match_coverage": 81.82,
-          "matcher": "3-seq",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0_1142.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-          "matched_text": "Free Software licensed under the GNU General Public License"
+          "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+          "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "samba/README.md",
           "start_line": 22,
           "end_line": 24,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 24,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-1.0-plus_579.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+          "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+          "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "license_expression_spdx": "GPL-3.0-only",
           "from_file": "samba/COPYING",
           "start_line": 1,
           "end_line": 674,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5514,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0",
-          "license_expression_spdx": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_204.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-          "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+          "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+          "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
         }
       ]
     },
@@ -758,19 +797,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "samba/source3/locale/net/genmsg",
           "start_line": 5,
           "end_line": 16,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-          "matched_text": "This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see ."
+          "matched_text": "#   This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see .",
+          "matched_text_diagnostics": "This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see ."
         }
       ]
     }
@@ -791,19 +831,20 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/COPYING",
               "start_line": 1,
               "end_line": 674,
-              "from_file": "samba/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [],
@@ -871,19 +912,20 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 63,
               "end_line": 63,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License,"
+              "matched_text": "    by me, under the GNU General Public License, in the",
+              "matched_text_diagnostics": "the GNU General Public License,"
             }
           ],
           "detection_log": [],
@@ -894,79 +936,84 @@
           "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 76,
               "end_line": 76,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-              "matched_text": "GNU GPL"
+              "matched_text": "    requirements of the GNU GPL where they are relevant.",
+              "matched_text_diagnostics": "GNU GPL"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 79,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+              "matched_text_diagnostics": "the GNU General Public License"
             },
             {
-              "score": 47.22,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 81,
-              "from_file": "samba/README.contributing",
+              "matcher": "3-seq",
+              "score": 47.22,
               "matched_length": 17,
               "match_coverage": 47.22,
-              "matcher": "3-seq",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-              "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+              "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 84,
               "end_line": 84,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-              "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 85,
               "end_line": 85,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-              "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
             }
           ],
           "detection_log": [],
@@ -977,49 +1024,52 @@
           "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
           "matches": [
             {
-              "score": 75.0,
-              "start_line": 121,
-              "end_line": 122,
+              "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
               "from_file": "samba/README.contributing",
+              "start_line": 121,
+              "end_line": 122,
+              "matcher": "3-seq",
+              "score": 75.0,
               "matched_length": 12,
               "match_coverage": 75.0,
-              "matcher": "3-seq",
-              "license_expression": "cc-by-sa-3.0",
-              "spdx_license_expression": "CC-BY-SA-3.0",
-              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-              "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+              "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
             },
             {
-              "score": 100.0,
+              "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
+              "from_file": "samba/README.contributing",
               "start_line": 122,
               "end_line": 122,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-sa-4.0",
-              "spdx_license_expression": "CC-BY-SA-4.0",
-              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-              "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+              "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
             },
             {
-              "score": 100.0,
+              "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
+              "from_file": "samba/README.contributing",
               "start_line": 123,
               "end_line": 123,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "dco-1.1",
-              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
-              "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "dco-1.1_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-              "matched_text": "Developer's Certificate of Origin 1.1\""
+              "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+              "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
             }
           ],
           "detection_log": [],
@@ -1028,79 +1078,84 @@
       ],
       "license_clues": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0",
+          "spdx_license_expression": "GPL-3.0-only",
+          "from_file": "samba/README.contributing",
           "start_line": 38,
           "end_line": 38,
-          "from_file": "samba/README.contributing",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-3.0",
-          "spdx_license_expression": "GPL-3.0-only",
-          "rule_identifier": "gpl-3.0_32.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-3.0_32.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_32.RULE",
-          "matched_text": "GPLv3"
+          "matched_text": "accommodate the licenses we use, which are GPLv3 and LGPLv3 (or later)",
+          "matched_text_diagnostics": "GPLv3"
         },
         {
-          "score": 100.0,
+          "license_expression": "lgpl-3.0",
+          "spdx_license_expression": "LGPL-3.0-only",
+          "from_file": "samba/README.contributing",
           "start_line": 38,
           "end_line": 38,
-          "from_file": "samba/README.contributing",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-3.0",
-          "spdx_license_expression": "LGPL-3.0-only",
-          "rule_identifier": "lgpl-3.0_29.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-3.0_29.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_29.RULE",
-          "matched_text": "LGPLv3 ("
+          "matched_text": "accommodate the licenses we use, which are GPLv3 and LGPLv3 (or later)",
+          "matched_text_diagnostics": "LGPLv3 ("
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "spdx_license_expression": "GPL-2.0-only",
+          "from_file": "samba/README.contributing",
           "start_line": 39,
           "end_line": 39,
-          "from_file": "samba/README.contributing",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "spdx_license_expression": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_bare_single_word.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0_bare_single_word.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
-          "matched_text": "GPLv2."
+          "matched_text": "whereas the Linux kernel uses GPLv2.",
+          "matched_text_diagnostics": "GPLv2."
         },
         {
-          "score": 20.0,
+          "license_expression": "gpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-or-later",
+          "from_file": "samba/README.contributing",
           "start_line": 57,
           "end_line": 57,
-          "from_file": "samba/README.contributing",
+          "matcher": "3-seq",
+          "score": 20.0,
           "matched_length": 6,
           "match_coverage": 20.0,
-          "matcher": "3-seq",
-          "license_expression": "gpl-2.0-plus",
-          "spdx_license_expression": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_627.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "gpl-2.0-plus_627.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_627.RULE",
-          "matched_text": "of the GNU General Public License;"
+          "matched_text": "    version of the GNU General Public License; or",
+          "matched_text_diagnostics": "of the GNU General Public License;"
         },
         {
-          "score": 50.0,
+          "license_expression": "free-unknown",
+          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+          "from_file": "samba/README.contributing",
           "start_line": 60,
           "end_line": 61,
-          "from_file": "samba/README.contributing",
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown_88.RULE",
           "rule_relevance": 50,
+          "rule_identifier": "free-unknown_88.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_88.RULE",
-          "matched_text": "open source\n    license"
+          "matched_text": "    of my knowledge, is covered under an appropriate open source\n    license and I have the right under that license to submit that",
+          "matched_text_diagnostics": "open source\n    license"
         }
       ],
       "percentage_of_license_text": 9.84,
@@ -1121,19 +1176,20 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 81.82,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "samba/README.md",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "samba/README.md",
+              "matcher": "3-seq",
+              "score": 81.82,
               "matched_length": 9,
               "match_coverage": 81.82,
-              "matcher": "3-seq",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-              "matched_text": "Free Software licensed under the GNU General Public License"
+              "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+              "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
             }
           ],
           "detection_log": [],
@@ -1144,34 +1200,36 @@
           "license_expression_spdx": "GPL-3.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.md",
               "start_line": 22,
               "end_line": 24,
-              "from_file": "samba/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 24,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+              "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/COPYING",
               "start_line": 1,
               "end_line": 674,
-              "from_file": "samba/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [
@@ -1220,19 +1278,20 @@
               "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/COPYING",
                   "start_line": 1,
                   "end_line": 674,
-                  "from_file": "samba/COPYING",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5514,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+                  "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
                 }
               ],
               "detection_log": [],
@@ -1243,19 +1302,20 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 63,
                   "end_line": 63,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-                  "matched_text": "the GNU General Public License,"
+                  "matched_text": "    by me, under the GNU General Public License, in the",
+                  "matched_text_diagnostics": "the GNU General Public License,"
                 }
               ],
               "detection_log": [],
@@ -1266,79 +1326,84 @@
               "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 76,
                   "end_line": 76,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-                  "matched_text": "GNU GPL"
+                  "matched_text": "    requirements of the GNU GPL where they are relevant.",
+                  "matched_text_diagnostics": "GNU GPL"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 79,
                   "end_line": 79,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-                  "matched_text": "the GNU General Public License"
+                  "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+                  "matched_text_diagnostics": "the GNU General Public License"
                 },
                 {
-                  "score": 47.22,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 79,
                   "end_line": 81,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "3-seq",
+                  "score": 47.22,
                   "matched_length": 17,
                   "match_coverage": 47.22,
-                  "matcher": "3-seq",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-                  "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+                  "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+                  "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/README.contributing",
                   "start_line": 84,
                   "end_line": 84,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-                  "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+                  "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+                  "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
+                  "from_file": "samba/README.contributing",
                   "start_line": 85,
                   "end_line": 85,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0",
-                  "spdx_license_expression": "LGPL-3.0-only",
-                  "rule_identifier": "lgpl-3.0_1.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0_1.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-                  "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+                  "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+                  "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
                 }
               ],
               "detection_log": [],
@@ -1349,49 +1414,52 @@
               "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
               "matches": [
                 {
-                  "score": 75.0,
+                  "license_expression": "cc-by-sa-3.0",
+                  "spdx_license_expression": "CC-BY-SA-3.0",
+                  "from_file": "samba/README.contributing",
                   "start_line": 121,
                   "end_line": 122,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "3-seq",
+                  "score": 75.0,
                   "matched_length": 12,
                   "match_coverage": 75.0,
-                  "matcher": "3-seq",
-                  "license_expression": "cc-by-sa-3.0",
-                  "spdx_license_expression": "CC-BY-SA-3.0",
-                  "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-                  "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+                  "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+                  "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "cc-by-sa-4.0",
+                  "spdx_license_expression": "CC-BY-SA-4.0",
+                  "from_file": "samba/README.contributing",
                   "start_line": 122,
                   "end_line": 122,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "cc-by-sa-4.0",
-                  "spdx_license_expression": "CC-BY-SA-4.0",
-                  "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-                  "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+                  "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+                  "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "dco-1.1",
+                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
+                  "from_file": "samba/README.contributing",
                   "start_line": 123,
                   "end_line": 123,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "dco-1.1",
-                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
-                  "rule_identifier": "dco-1.1_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "dco-1.1_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-                  "matched_text": "Developer's Certificate of Origin 1.1\""
+                  "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+                  "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
                 }
               ],
               "detection_log": [],
@@ -1402,19 +1470,20 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 81.82,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": "samba/README.md",
                   "start_line": 6,
                   "end_line": 6,
-                  "from_file": "samba/README.md",
+                  "matcher": "3-seq",
+                  "score": 81.82,
                   "matched_length": 9,
                   "match_coverage": 81.82,
-                  "matcher": "3-seq",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-                  "matched_text": "Free Software licensed under the GNU General Public License"
+                  "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+                  "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
                 }
               ],
               "detection_log": [],
@@ -1425,34 +1494,36 @@
               "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.md",
                   "start_line": 22,
                   "end_line": 24,
-                  "from_file": "samba/README.md",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 24,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-                  "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+                  "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+                  "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/COPYING",
                   "start_line": 1,
                   "end_line": 674,
-                  "from_file": "samba/COPYING",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5514,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+                  "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
                 }
               ],
               "detection_log": [
@@ -1537,19 +1608,20 @@
               "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/COPYING",
                   "start_line": 1,
                   "end_line": 674,
-                  "from_file": "samba/COPYING",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5514,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+                  "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
                 }
               ],
               "detection_log": [],
@@ -1560,19 +1632,20 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 63,
                   "end_line": 63,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-                  "matched_text": "the GNU General Public License,"
+                  "matched_text": "    by me, under the GNU General Public License, in the",
+                  "matched_text_diagnostics": "the GNU General Public License,"
                 }
               ],
               "detection_log": [],
@@ -1583,79 +1656,84 @@
               "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 76,
                   "end_line": 76,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl_bare_gnu_gpl.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-                  "matched_text": "GNU GPL"
+                  "matched_text": "    requirements of the GNU GPL where they are relevant.",
+                  "matched_text_diagnostics": "GNU GPL"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 79,
                   "end_line": 79,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_33.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-                  "matched_text": "the GNU General Public License"
+                  "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+                  "matched_text_diagnostics": "the GNU General Public License"
                 },
                 {
-                  "score": 47.22,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": "samba/README.contributing",
                   "start_line": 79,
                   "end_line": 81,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "3-seq",
+                  "score": 47.22,
                   "matched_length": 17,
                   "match_coverage": 47.22,
-                  "matcher": "3-seq",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_103.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-                  "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+                  "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+                  "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/README.contributing",
                   "start_line": 84,
                   "end_line": 84,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_12.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-                  "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+                  "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+                  "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0",
+                  "spdx_license_expression": "LGPL-3.0-only",
+                  "from_file": "samba/README.contributing",
                   "start_line": 85,
                   "end_line": 85,
-                  "from_file": "samba/README.contributing",
-                  "matched_length": 9,
-                  "match_coverage": 100.0,
                   "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0",
-                  "spdx_license_expression": "LGPL-3.0-only",
-                  "rule_identifier": "lgpl-3.0_1.RULE",
+                  "score": 100.0,
+                  "matched_length": 9,
+                  "match_coverage": 100.0,
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0_1.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-                  "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+                  "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+                  "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
                 }
               ],
               "detection_log": [],
@@ -1666,49 +1744,52 @@
               "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
               "matches": [
                 {
-                  "score": 75.0,
+                  "license_expression": "cc-by-sa-3.0",
+                  "spdx_license_expression": "CC-BY-SA-3.0",
+                  "from_file": "samba/README.contributing",
                   "start_line": 121,
                   "end_line": 122,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "3-seq",
+                  "score": 75.0,
                   "matched_length": 12,
                   "match_coverage": 75.0,
-                  "matcher": "3-seq",
-                  "license_expression": "cc-by-sa-3.0",
-                  "spdx_license_expression": "CC-BY-SA-3.0",
-                  "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cc-by-sa-3.0_10.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-                  "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+                  "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+                  "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "cc-by-sa-4.0",
+                  "spdx_license_expression": "CC-BY-SA-4.0",
+                  "from_file": "samba/README.contributing",
                   "start_line": 122,
                   "end_line": 122,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "cc-by-sa-4.0",
-                  "spdx_license_expression": "CC-BY-SA-4.0",
-                  "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cc-by-sa-4.0_71.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-                  "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+                  "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+                  "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "dco-1.1",
+                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
+                  "from_file": "samba/README.contributing",
                   "start_line": 123,
                   "end_line": 123,
-                  "from_file": "samba/README.contributing",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "dco-1.1",
-                  "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
-                  "rule_identifier": "dco-1.1_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "dco-1.1_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-                  "matched_text": "Developer's Certificate of Origin 1.1\""
+                  "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+                  "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
                 }
               ],
               "detection_log": [],
@@ -1719,19 +1800,20 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 81.82,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": "samba/README.md",
                   "start_line": 6,
                   "end_line": 6,
-                  "from_file": "samba/README.md",
+                  "matcher": "3-seq",
+                  "score": 81.82,
                   "matched_length": 9,
                   "match_coverage": 81.82,
-                  "matcher": "3-seq",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_1142.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-                  "matched_text": "Free Software licensed under the GNU General Public License"
+                  "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+                  "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
                 }
               ],
               "detection_log": [],
@@ -1742,34 +1824,36 @@
               "license_expression_spdx": "GPL-3.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "samba/README.md",
                   "start_line": 22,
                   "end_line": 24,
-                  "from_file": "samba/README.md",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 24,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-1.0-plus_579.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-                  "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+                  "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+                  "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0",
+                  "spdx_license_expression": "GPL-3.0-only",
+                  "from_file": "samba/COPYING",
                   "start_line": 1,
                   "end_line": 674,
-                  "from_file": "samba/COPYING",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5514,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0",
-                  "spdx_license_expression": "GPL-3.0-only",
-                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0_204.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-                  "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+                  "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+                  "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
                 }
               ],
               "detection_log": [
@@ -1861,214 +1945,228 @@
           "license_expression_spdx": "GPL-3.0-only AND GPL-1.0-or-later AND LGPL-3.0-or-later AND LGPL-3.0-only AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1 AND GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "free-unknown",
+              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+              "from_file": "samba/source3/locale/net/de.po",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "samba/source3/locale/net/de.po",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 10,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "free-unknown",
-              "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "free-unknown-package_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown-package_4.RULE",
-              "matched_text": "This file is distributed under the same license as the"
+              "matched_text": "# This file is distributed under the same license as the samba package.",
+              "matched_text_diagnostics": "This file is distributed under the same license as the"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/COPYING",
               "start_line": 1,
               "end_line": 674,
-              "from_file": "samba/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 63,
               "end_line": 63,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License,"
+              "matched_text": "    by me, under the GNU General Public License, in the",
+              "matched_text_diagnostics": "the GNU General Public License,"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 76,
               "end_line": 76,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_bare_gnu_gpl.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_gnu_gpl.RULE",
-              "matched_text": "GNU GPL"
+              "matched_text": "    requirements of the GNU GPL where they are relevant.",
+              "matched_text_diagnostics": "GNU GPL"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 79,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_33.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_33.RULE",
-              "matched_text": "the GNU General Public License"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public",
+              "matched_text_diagnostics": "the GNU General Public License"
             },
             {
-              "score": 47.22,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "samba/README.contributing",
               "start_line": 79,
               "end_line": 81,
-              "from_file": "samba/README.contributing",
+              "matcher": "3-seq",
+              "score": 47.22,
               "matched_length": 17,
               "match_coverage": 47.22,
-              "matcher": "3-seq",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_103.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_103.RULE",
-              "matched_text": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
+              "matched_text": "    the GNU General Public License and the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of these Licenses, or (at the option of the project) any later",
+              "matched_text_diagnostics": "the GNU Lesser General Public\n    License as published by the Free Software Foundation; either version\n    3 of"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 84,
               "end_line": 84,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_12.RULE",
-              "matched_text": "http://www.gnu.org/licenses/gpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/gpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/gpl-3.0.html"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0",
+              "spdx_license_expression": "LGPL-3.0-only",
+              "from_file": "samba/README.contributing",
               "start_line": 85,
               "end_line": 85,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0",
-              "spdx_license_expression": "LGPL-3.0-only",
-              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_1.RULE",
-              "matched_text": "http://www.gnu.org/licenses/lgpl-3.0.html"
+              "matched_text": "    http://www.gnu.org/licenses/lgpl-3.0.html",
+              "matched_text_diagnostics": "http://www.gnu.org/licenses/lgpl-3.0.html"
             },
             {
-              "score": 75.0,
+              "license_expression": "cc-by-sa-3.0",
+              "spdx_license_expression": "CC-BY-SA-3.0",
+              "from_file": "samba/README.contributing",
               "start_line": 121,
               "end_line": 122,
-              "from_file": "samba/README.contributing",
+              "matcher": "3-seq",
+              "score": 75.0,
               "matched_length": 12,
               "match_coverage": 75.0,
-              "matcher": "3-seq",
-              "license_expression": "cc-by-sa-3.0",
-              "spdx_license_expression": "CC-BY-SA-3.0",
-              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-3.0_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-3.0_10.RULE",
-              "matched_text": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
+              "matched_text": "licensed under Creative Commons Attribution-ShareAlike 4.0 License as found\nat https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "licensed under Creative Commons Attribution-ShareAlike [4].[0] License [as] [found]\n[at] [https]://creativecommons.org/licenses/by-sa/"
             },
             {
-              "score": 100.0,
+              "license_expression": "cc-by-sa-4.0",
+              "spdx_license_expression": "CC-BY-SA-4.0",
+              "from_file": "samba/README.contributing",
               "start_line": 122,
               "end_line": 122,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-sa-4.0",
-              "spdx_license_expression": "CC-BY-SA-4.0",
-              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-sa-4.0_71.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE",
-              "matched_text": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
+              "matched_text": "at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on",
+              "matched_text_diagnostics": "https://creativecommons.org/licenses/by-sa/4.0/legalcode"
             },
             {
-              "score": 100.0,
+              "license_expression": "dco-1.1",
+              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
+              "from_file": "samba/README.contributing",
               "start_line": 123,
               "end_line": 123,
-              "from_file": "samba/README.contributing",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "dco-1.1",
-              "spdx_license_expression": "LicenseRef-scancode-dco-1.1",
-              "rule_identifier": "dco-1.1_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "dco-1.1_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/dco-1.1_2.RULE",
-              "matched_text": "Developer's Certificate of Origin 1.1\""
+              "matched_text": "\"Developer's Certificate of Origin 1.1\" as found at",
+              "matched_text_diagnostics": "Developer's Certificate of Origin 1.1\""
             },
             {
-              "score": 81.82,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "samba/README.md",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "samba/README.md",
+              "matcher": "3-seq",
+              "score": 81.82,
               "matched_length": 9,
               "match_coverage": 81.82,
-              "matcher": "3-seq",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1142.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1142.RULE",
-              "matched_text": "Free Software licensed under the GNU General Public License"
+              "matched_text": "Samba is Free Software licensed under the GNU General Public License and",
+              "matched_text_diagnostics": "Free Software licensed under the GNU General Public License"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "samba/README.md",
               "start_line": 22,
               "end_line": 24,
-              "from_file": "samba/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 24,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-1.0-plus_579.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_579.RULE",
-              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
+              "matched_text": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING).",
+              "matched_text_diagnostics": "This software is freely distributable under the GNU public license, a\ncopy of which you should have received with this software (in a file\ncalled COPYING)."
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0",
+              "spdx_license_expression": "GPL-3.0-only",
+              "from_file": "samba/COPYING",
               "start_line": 1,
               "end_line": 674,
-              "from_file": "samba/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5514,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0",
-              "spdx_license_expression": "GPL-3.0-only",
-              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0_204.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_204.RULE",
-              "matched_text": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
+              "matched_text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n.",
+              "matched_text_diagnostics": "GNU GENERAL PUBLIC LICENSE\n                       Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n                            Preamble\n\n  The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n  The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works.  By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.  We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors.  You can apply it to\nyour programs, too.\n\n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n  To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights.  Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received.  You must make sure that they, too, receive\nor can get the source code.  And you must show them these terms so they\nknow their rights.\n\n  Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n  For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software.  For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n  Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so.  This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software.  The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable.  Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts.  If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n  Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary.  To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n  The precise terms and conditions for copying, distribution and\nmodification follow.\n\n                       TERMS AND CONDITIONS\n\n  0. Definitions.\n\n  \"This License\" refers to version 3 of the GNU General Public License.\n\n  \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n  \"The Program\" refers to any copyrightable work licensed under this\nLicense.  Each licensee is addressed as \"you\".  \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n  To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy.  The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n  A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n  To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy.  Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n  To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies.  Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n  An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License.  If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n  1. Source Code.\n\n  The \"source code\" for a work means the preferred form of the work\nfor making modifications to it.  \"Object code\" means any non-source\nform of a work.\n\n  A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n  The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form.  A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n  The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities.  However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work.  For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n  The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n  The Corresponding Source for a work in source code form is that\nsame work.\n\n  2. Basic Permissions.\n\n  All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met.  This License explicitly affirms your unlimited\npermission to run the unmodified Program.  The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work.  This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n  You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force.  You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright.  Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n  Conveying under any other circumstances is permitted solely under\nthe conditions stated below.  Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n  3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n  No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n  When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n  4. Conveying Verbatim Copies.\n\n  You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n  You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n  5. Conveying Modified Source Versions.\n\n  You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n    a) The work must carry prominent notices stating that you modified\n    it, and giving a relevant date.\n\n    b) The work must carry prominent notices stating that it is\n    released under this License and any conditions added under section\n    7.  This requirement modifies the requirement in section 4 to\n    \"keep intact all notices\".\n\n    c) You must license the entire work, as a whole, under this\n    License to anyone who comes into possession of a copy.  This\n    License will therefore apply, along with any applicable section 7\n    additional terms, to the whole of the work, and all its parts,\n    regardless of how they are packaged.  This License gives no\n    permission to license the work in any other way, but it does not\n    invalidate such permission if you have separately received it.\n\n    d) If the work has interactive user interfaces, each must display\n    Appropriate Legal Notices; however, if the Program has interactive\n    interfaces that do not display Appropriate Legal Notices, your\n    work need not make them do so.\n\n  A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit.  Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n  6. Conveying Non-Source Forms.\n\n  You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n    a) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by the\n    Corresponding Source fixed on a durable physical medium\n    customarily used for software interchange.\n\n    b) Convey the object code in, or embodied in, a physical product\n    (including a physical distribution medium), accompanied by a\n    written offer, valid for at least three years and valid for as\n    long as you offer spare parts or customer support for that product\n    model, to give anyone who possesses the object code either (1) a\n    copy of the Corresponding Source for all the software in the\n    product that is covered by this License, on a durable physical\n    medium customarily used for software interchange, for a price no\n    more than your reasonable cost of physically performing this\n    conveying of source, or (2) access to copy the\n    Corresponding Source from a network server at no charge.\n\n    c) Convey individual copies of the object code with a copy of the\n    written offer to provide the Corresponding Source.  This\n    alternative is allowed only occasionally and noncommercially, and\n    only if you received the object code with such an offer, in accord\n    with subsection 6b.\n\n    d) Convey the object code by offering access from a designated\n    place (gratis or for a charge), and offer equivalent access to the\n    Corresponding Source in the same way through the same place at no\n    further charge.  You need not require recipients to copy the\n    Corresponding Source along with the object code.  If the place to\n    copy the object code is a network server, the Corresponding Source\n    may be on a different server (operated by you or a third party)\n    that supports equivalent copying facilities, provided you maintain\n    clear directions next to the object code saying where to find the\n    Corresponding Source.  Regardless of what server hosts the\n    Corresponding Source, you remain obligated to ensure that it is\n    available for as long as needed to satisfy these requirements.\n\n    e) Convey the object code using peer-to-peer transmission, provided\n    you inform other peers where the object code and Corresponding\n    Source of the work are being offered to the general public at no\n    charge under subsection 6d.\n\n  A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n  A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling.  In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage.  For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product.  A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n  \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source.  The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n  If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information.  But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n  The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed.  Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n  Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n  7. Additional Terms.\n\n  \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law.  If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n  When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit.  (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.)  You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n  Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n    a) Disclaiming warranty or limiting liability differently from the\n    terms of sections 15 and 16 of this License; or\n\n    b) Requiring preservation of specified reasonable legal notices or\n    author attributions in that material or in the Appropriate Legal\n    Notices displayed by works containing it; or\n\n    c) Prohibiting misrepresentation of the origin of that material, or\n    requiring that modified versions of such material be marked in\n    reasonable ways as different from the original version; or\n\n    d) Limiting the use for publicity purposes of names of licensors or\n    authors of the material; or\n\n    e) Declining to grant rights under trademark law for use of some\n    trade names, trademarks, or service marks; or\n\n    f) Requiring indemnification of licensors and authors of that\n    material by anyone who conveys the material (or modified versions of\n    it) with contractual assumptions of liability to the recipient, for\n    any liability that these contractual assumptions directly impose on\n    those licensors and authors.\n\n  All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10.  If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term.  If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n  If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n  Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n  8. Termination.\n\n  You may not propagate or modify a covered work except as expressly\nprovided under this License.  Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n  However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n  Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n  Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License.  If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n  9. Acceptance Not Required for Having Copies.\n\n  You are not required to accept this License in order to receive or\nrun a copy of the Program.  Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance.  However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work.  These actions infringe copyright if you do\nnot accept this License.  Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n  10. Automatic Licensing of Downstream Recipients.\n\n  Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License.  You are not responsible\nfor enforcing compliance by third parties with this License.\n\n  An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations.  If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n  You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License.  For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n  11. Patents.\n\n  A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based.  The\nwork thus licensed is called the contributor's \"contributor version\".\n\n  A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version.  For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n  Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n  In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement).  To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n  If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients.  \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n  If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n  A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License.  You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n  Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n  12. No Surrender of Others' Freedom.\n\n  If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all.  For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n  13. Use with the GNU Affero General Public License.\n\n  Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work.  The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n  14. Revised Versions of this License.\n\n  The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n  Each version is given a distinguishing version number.  If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation.  If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n  If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n  Later license versions may give you additional or different\npermissions.  However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n  15. Disclaimer of Warranty.\n\n  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. Limitation of Liability.\n\n  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n  17. Interpretation of Sections 15 and 16.\n\n  If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n                     END OF TERMS AND CONDITIONS\n\n            How to Apply These Terms to Your New Programs\n\n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n    \n    Copyright (C)   \n\n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n  If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n      Copyright (C)   \n    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n  You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n  The GNU General Public License does not permit incorporating your program\ninto proprietary programs.  If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.  But first, please read\n."
             }
           ],
           "detection_log": [
@@ -2096,19 +2194,20 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "samba/source3/locale/net/genmsg",
               "start_line": 5,
               "end_line": 16,
-              "from_file": "samba/source3/locale/net/genmsg",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-              "matched_text": "This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see ."
+              "matched_text": "#   This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see .",
+              "matched_text_diagnostics": "This program is free software; you can redistribute it and/or modify\n#   it under the terms of the GNU General Public License as published by\n#   the Free Software Foundation; either version 3 of the License, or\n#   (at your option) any later version.\n#\n#   This program is distributed in the hope that it will be useful,\n#   but WITHOUT ANY WARRANTY; without even the implied warranty of\n#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n#   GNU General Public License for more details.\n#\n#   You should have received a copy of the GNU General Public License\n#   along with this program; if not, see ."
             }
           ],
           "detection_log": [],
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 e501a716e94..802121c1078 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
               "start_line": 1,
               "end_line": 8,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 43,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_394.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
             }
           ],
@@ -62,31 +62,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
               "start_line": 11,
               "end_line": 13,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 26,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
               "start_line": 1,
               "end_line": 8,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 43,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_394.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
             }
           ],
@@ -128,34 +128,32 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 26,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_375.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_375.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 43,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_394.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_394.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
         }
       ]
     },
@@ -167,19 +165,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 43,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_394.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_394.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
         }
       ]
     }
@@ -226,17 +223,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
               "start_line": 1,
               "end_line": 8,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 43,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_394.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
             }
           ],
@@ -289,17 +286,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
                   "start_line": 1,
                   "end_line": 8,
-                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 43,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_394.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_394.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
                 }
               ],
@@ -311,31 +308,31 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
                   "start_line": 11,
                   "end_line": 13,
-                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 26,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_375.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "unknown-license-reference_375.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
                   "start_line": 1,
                   "end_line": 8,
-                  "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 43,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_394.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_394.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
                 }
               ],
@@ -386,31 +383,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
               "start_line": 11,
               "end_line": 13,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 26,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_375.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_375.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
               "start_line": 1,
               "end_line": 8,
-              "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 43,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_394.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_394.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_394.RULE"
             }
           ],
@@ -422,17 +419,17 @@
       ],
       "license_clues": [
         {
-          "score": 100.0,
+          "license_expression": "free-unknown",
+          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
+          "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
           "start_line": 3,
           "end_line": 3,
-          "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE",
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "free-unknown",
-          "spdx_license_expression": "LicenseRef-scancode-free-unknown",
-          "rule_identifier": "free-unknown_85.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "free-unknown_85.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_85.RULE"
         }
       ],
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 0383f53b815..ac82dc6c285 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
@@ -32,17 +32,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
@@ -241,19 +241,18 @@
       ],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
         }
       ]
     },
@@ -265,19 +264,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
-          "matched_text": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+          "rule_identifier": "apache-2.0_42.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE"
         }
       ]
     },
@@ -289,19 +287,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 95.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 95.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_product_includes_2.RULE",
           "rule_relevance": 95,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_product_includes_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
         }
       ]
     },
@@ -313,19 +310,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_osgi.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_osgi.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE"
         }
       ]
     },
@@ -337,19 +333,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_791.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_791.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
         }
       ]
     },
@@ -361,19 +356,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 64.18,
+          "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,
+          "matcher": "3-seq",
+          "score": 64.18,
           "matched_length": 43,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1247.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_1247.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE"
         }
       ]
     }
@@ -422,17 +416,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 64.18,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "johnzon-jsonb-1.2.11/META-INF/DEPENDENCIES",
               "start_line": 9,
               "end_line": 13,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/DEPENDENCIES",
+              "matcher": "3-seq",
+              "score": 64.18,
               "matched_length": 43,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1247.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1247.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1247.RULE"
             }
           ],
@@ -459,17 +453,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "johnzon-jsonb-1.2.11/META-INF/LICENSE",
               "start_line": 2,
               "end_line": 4,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_791.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
             }
           ],
@@ -522,17 +516,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
                   "matched_text": "http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -569,17 +563,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_osgi.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_osgi.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_osgi.RULE"
             }
           ],
@@ -606,17 +600,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "johnzon-jsonb-1.2.11/META-INF/NOTICE",
               "start_line": 5,
               "end_line": 6,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/NOTICE",
+              "matcher": "2-aho",
+              "score": 95.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
             }
           ],
@@ -763,17 +757,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "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,
-                  "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 119,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
                 }
               ],
@@ -923,17 +917,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
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 ad9fa921c5a..1049d5c0360 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
@@ -47,17 +47,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_203.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_203.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
               "matched_text": "- name: CC0 Universal\n  url: http://www.creativecommons.org/publicdomain/zero/1.0/"
             }
@@ -112,19 +112,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_197.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE",
-          "matched_text": null
+          "rule_identifier": "cc0-1.0_197.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE"
         }
       ]
     },
@@ -136,19 +135,18 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_203.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
-          "matched_text": "- name: CC0 Universal\n  url: http://www.creativecommons.org/publicdomain/zero/1.0/"
+          "rule_identifier": "cc0-1.0_203.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE"
         }
       ]
     }
@@ -389,17 +387,17 @@
               "license_expression_spdx": "CC0-1.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "cc0-1.0",
+                  "spdx_license_expression": "CC0-1.0",
+                  "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 12,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "cc0-1.0",
-                  "spdx_license_expression": "CC0-1.0",
-                  "rule_identifier": "cc0-1.0_203.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "cc0-1.0_203.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_203.RULE",
                   "matched_text": "- name: CC0 Universal\n  url: http://www.creativecommons.org/publicdomain/zero/1.0/"
                 }
@@ -447,17 +445,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
               "start_line": 86,
               "end_line": 91,
-              "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 20,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_197.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_197.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_197.RULE"
             }
           ],
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 cb164b2d4fe..1c4838ec7aa 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
               "start_line": 2,
               "end_line": 4,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_791.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
             }
           ],
@@ -61,17 +61,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
               "start_line": 5,
               "end_line": 6,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
+              "matcher": "2-aho",
+              "score": 95.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
             }
           ],
@@ -273,17 +273,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
@@ -343,17 +343,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
@@ -588,19 +588,18 @@
       "detection_count": 4,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 119,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
         }
       ]
     },
@@ -611,19 +610,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 95.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 95.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_product_includes_2.RULE",
           "rule_relevance": 95,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_product_includes_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
         }
       ]
     },
@@ -634,19 +632,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_791.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_791.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
         }
       ]
     },
@@ -657,64 +654,60 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 17,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 17,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 17,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 17,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_212.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_212.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
         }
       ]
     }
@@ -761,59 +754,59 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
               "start_line": 11,
               "end_line": 11,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 17,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_212.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
               "start_line": 13,
               "end_line": 13,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 17,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_212.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
               "start_line": 15,
               "end_line": 15,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 17,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_212.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
               "start_line": 19,
               "end_line": 19,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 17,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_212.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_212.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_212.RULE"
             }
           ],
@@ -839,17 +832,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
               "start_line": 2,
               "end_line": 4,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_791.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_791.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
             }
           ],
@@ -901,17 +894,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
                   "start_line": 2,
                   "end_line": 4,
-                  "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 12,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_791.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_791.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_791.RULE"
                 }
               ],
@@ -922,17 +915,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 95.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
                   "start_line": 5,
                   "end_line": 6,
-                  "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
+                  "matcher": "2-aho",
+                  "score": 95.0,
                   "matched_length": 14,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_product_includes_2.RULE",
                   "rule_relevance": 95,
+                  "rule_identifier": "apache-2.0_product_includes_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
                 }
               ],
@@ -980,17 +973,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 95.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
               "start_line": 5,
               "end_line": 6,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE",
+              "matcher": "2-aho",
+              "score": 95.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_relevance": 95,
+              "rule_identifier": "apache-2.0_product_includes_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_product_includes_2.RULE"
             }
           ],
@@ -1366,17 +1359,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "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,
-                  "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 119,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
                 }
               ],
@@ -1464,17 +1457,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
@@ -1549,17 +1542,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "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,
-                  "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 119,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
                 }
               ],
@@ -1637,17 +1630,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "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,
-              "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 119,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_2.RULE"
             }
           ],
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 a4fac4fedbd..41ffab3cc82 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
@@ -53,17 +53,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -75,17 +75,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -125,19 +125,18 @@
       "detection_count": 5,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 15,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
         }
       ]
     },
@@ -148,19 +147,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     },
@@ -171,19 +169,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 8,
           "end_line": 8,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -194,34 +191,32 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -232,49 +227,46 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -285,19 +277,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -308,34 +299,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/setup.py",
           "start_line": 31,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/setup.py",
           "start_line": 35,
           "end_line": 35,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
         }
       ]
     }
@@ -370,17 +359,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -476,17 +465,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/PKG-INFO",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -498,17 +487,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -546,17 +535,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 8,
               "end_line": 8,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -567,17 +556,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 15,
               "end_line": 15,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -588,31 +577,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 27,
               "end_line": 27,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -914,17 +903,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
@@ -993,45 +982,45 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "pip-22.0.4/setup.cfg",
                   "start_line": 87,
                   "end_line": 87,
-                  "from_file": "pip-22.0.4/setup.cfg",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
@@ -1068,45 +1057,45 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pip-22.0.4/setup.cfg",
               "start_line": 87,
               "end_line": 87,
-              "from_file": "pip-22.0.4/setup.cfg",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -1177,17 +1166,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/setup.py",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1199,17 +1188,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -1248,31 +1237,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/setup.py",
               "start_line": 31,
               "end_line": 31,
-              "from_file": "pip-22.0.4/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/setup.py",
               "start_line": 35,
               "end_line": 35,
-              "from_file": "pip-22.0.4/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -1376,17 +1365,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1398,17 +1387,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -1600,17 +1589,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
               "start_line": 8,
               "end_line": 8,
-              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -1621,17 +1610,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
               "start_line": 15,
               "end_line": 15,
-              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -1642,31 +1631,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
               "start_line": 27,
               "end_line": 27,
-              "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
diff --git a/tests/packagedcode/test_license_detection.py b/tests/packagedcode/test_license_detection.py
index ccb2ac62273..58424092c22 100644
--- a/tests/packagedcode/test_license_detection.py
+++ b/tests/packagedcode/test_license_detection.py
@@ -96,6 +96,23 @@ def test_license_reference_detection_in_manifest_licence_comment():
 
 
 def test_license_reference_detection_in_manifest_siblings():
+    test_dir = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection/', copy=True)
+    result_file = test_env.get_temp_file('json')
+    args = [
+        '--license',
+        '--license-text',
+        '--package',
+        '--strip-root',
+        '--verbose',
+        '--json', result_file,
+        test_dir,
+    ]
+    run_scan_click(args)
+    test_loc = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection.expected.json')
+    check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
+
+
+def test_license_reference_detection_in_manifest_siblings_with_diag():
     test_dir = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection/', copy=True)
     result_file = test_env.get_temp_file('json')
     args = [
@@ -110,7 +127,7 @@ def test_license_reference_detection_in_manifest_siblings():
         test_dir,
     ]
     run_scan_click(args)
-    test_loc = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection.expected.json')
+    test_loc = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection-diag.expected.json')
     check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
 
 
@@ -173,6 +190,23 @@ def test_license_reference_detection_in_manifest_siblings_without_license():
     test_loc = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection_without_license.expected.json')
     check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
 
+
+def test_license_reference_detection_in_manifest_siblings_without_license_text():
+    test_dir = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection/', copy=True)
+    result_file = test_env.get_temp_file('json')
+    args = [
+        '--package',
+        '--license',
+        '--strip-root',
+        '--verbose',
+        '--json', result_file,
+        test_dir,
+    ]
+    run_scan_click(args)
+    test_loc = test_env.get_test_loc('license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json')
+    check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
+
+
 def test_license_reference_to_unknown_package_complex_package():
     test_dir = test_env.get_test_loc('license_detection/reference-to-package/google_appengine_sdk/')
     result_file = test_env.get_temp_file('json')
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index 50b136e70a7..cebd06a85be 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
           "start_line": 25,
           "end_line": 51,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 243,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original-uc",
-          "license_expression_spdx": "BSD-4-Clause-UC",
-          "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
         }
       ]
     },
@@ -30,19 +29,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "from_file": "basic.tgz/basic/main.c",
           "start_line": 5,
           "end_line": 12,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 50,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0 OR bsd-new",
-          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
-          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
         }
       ]
     }
@@ -340,17 +338,17 @@
           "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
+              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
               "start_line": 25,
               "end_line": 51,
-              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 243,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original-uc",
-              "spdx_license_expression": "BSD-4-Clause-UC",
-              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
             }
           ],
@@ -446,17 +444,17 @@
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
+              "from_file": "basic.tgz/basic/main.c",
               "start_line": 5,
               "end_line": 12,
-              "from_file": "basic.tgz/basic/main.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 50,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0 OR bsd-new",
-              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
-              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
             }
           ],
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index cec2c84cad3..ce4117b3438 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
           "start_line": 25,
           "end_line": 51,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 243,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original-uc",
-          "license_expression_spdx": "BSD-4-Clause-UC",
-          "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
         }
       ]
     },
@@ -30,19 +29,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "from_file": "basic.tgz/basic/main.c",
           "start_line": 5,
           "end_line": 12,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 50,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0 OR bsd-new",
-          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
-          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
         }
       ]
     }
@@ -194,17 +192,17 @@
           "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
+              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
               "start_line": 25,
               "end_line": 51,
-              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 243,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original-uc",
-              "spdx_license_expression": "BSD-4-Clause-UC",
-              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
             }
           ],
@@ -282,17 +280,17 @@
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
+              "from_file": "basic.tgz/basic/main.c",
               "start_line": 5,
               "end_line": 12,
-              "from_file": "basic.tgz/basic/main.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 50,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0 OR bsd-new",
-              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
-              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
             }
           ],
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index 6a926fb7d82..c4b4b9fb3bd 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -8,19 +8,20 @@
       "detection_log": [],
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1",
+          "license_expression_spdx": "LGPL-2.1-only",
           "from_file": "test.txt",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1",
-          "license_expression_spdx": "LGPL-2.1-only",
-          "rule_identifier": "lgpl-2.1_38.RULE",
           "rule_relevance": 100,
+          "rule_identifier": "lgpl-2.1_38.RULE",
           "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"
+          "matched_text": "foo bar this that license: LGPL-2.1 bar",
+          "matched_text_diagnostics": "license: LGPL-2.1"
         }
       ]
     }
@@ -37,19 +38,20 @@
           "license_expression_spdx": "LGPL-2.1-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
+              "from_file": "test.txt",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "test.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1",
-              "spdx_license_expression": "LGPL-2.1-only",
-              "rule_identifier": "lgpl-2.1_38.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1_38.RULE",
               "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"
+              "matched_text": "foo bar this that license: LGPL-2.1 bar",
+              "matched_text_diagnostics": "license: LGPL-2.1"
             }
           ],
           "detection_log": [],
diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json
index 492fe294ef2..25a19d1037b 100644
--- a/tests/scancode/data/plugin_only_findings/basic.expected.json
+++ b/tests/scancode/data/plugin_only_findings/basic.expected.json
@@ -9,19 +9,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "bsd-original-uc",
+          "license_expression_spdx": "BSD-4-Clause-UC",
           "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
           "start_line": 25,
           "end_line": 51,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 243,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "bsd-original-uc",
-          "license_expression_spdx": "BSD-4-Clause-UC",
-          "rule_identifier": "bsd-original-uc_3.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE",
-          "matched_text": null
+          "rule_identifier": "bsd-original-uc_3.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
         }
       ]
     },
@@ -32,19 +31,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 OR bsd-new",
+          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "from_file": "basic.tgz/basic/main.c",
           "start_line": 5,
           "end_line": 12,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 50,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0 OR bsd-new",
-          "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
-          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
         }
       ]
     }
@@ -79,17 +77,17 @@
           "license_expression_spdx": "BSD-4-Clause-UC",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-original-uc",
+              "spdx_license_expression": "BSD-4-Clause-UC",
+              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
               "start_line": 25,
               "end_line": 51,
-              "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 243,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-original-uc",
-              "spdx_license_expression": "BSD-4-Clause-UC",
-              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-original-uc_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-original-uc_3.RULE"
             }
           ],
@@ -153,17 +151,17 @@
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0 OR bsd-new",
+              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
+              "from_file": "basic.tgz/basic/main.c",
               "start_line": 5,
               "end_line": 12,
-              "from_file": "basic.tgz/basic/main.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 50,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0 OR bsd-new",
-              "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause",
-              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_or_bsd-new_aes_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_or_bsd-new_aes_1.RULE"
             }
           ],
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 0bfb64262b7..4d490e6a5ec 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
@@ -78,17 +78,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/package/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "component-package-build/package/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -125,19 +125,18 @@
       "detection_count": 5,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "component-package-build/component/src1",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -148,19 +147,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     },
@@ -171,19 +169,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "component-package-build/package/src2",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1336.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_1336.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
         }
       ]
     },
@@ -194,19 +191,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "from_file": "component-package-build/component/src4",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.0",
-          "license_expression_spdx": "LGPL-2.0-only",
-          "rule_identifier": "lgpl-2.0_bare_id.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.0_bare_id.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
         }
       ]
     }
@@ -480,17 +476,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/component/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/component/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -551,17 +547,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/component/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/component/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -622,17 +618,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/component/src3",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/component/src3",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -693,17 +689,17 @@
           "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
+              "from_file": "component-package-build/component/src4",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/component/src4",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0",
-              "spdx_license_expression": "LGPL-2.0-only",
-              "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
             }
           ],
@@ -824,17 +820,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "component-package-build/package/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "component-package-build/package/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -869,17 +865,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/package/package.json",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "component-package-build/package/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
@@ -940,17 +936,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package-build/package/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/package/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -1011,17 +1007,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "component-package-build/package/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package-build/package/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
             }
           ],
diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
index cf07cc60791..5455c92c76f 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/package/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "component-package/package/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -79,19 +79,18 @@
       "detection_count": 5,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "component-package/component/src1",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -102,19 +101,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "component-package/package/package.json",
           "start_line": 5,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     },
@@ -125,19 +123,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "component-package/package/src2",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1336.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_1336.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
         }
       ]
     },
@@ -148,19 +145,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "lgpl-2.0",
+          "license_expression_spdx": "LGPL-2.0-only",
           "from_file": "component-package/component/src4",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.0",
-          "license_expression_spdx": "LGPL-2.0-only",
-          "rule_identifier": "lgpl-2.0_bare_id.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.0_bare_id.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
         }
       ]
     }
@@ -319,17 +315,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/component/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/component/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -390,17 +386,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/component/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/component/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -461,17 +457,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/component/src3",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/component/src3",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -532,17 +528,17 @@
           "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
+              "from_file": "component-package/component/src4",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/component/src4",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0",
-              "spdx_license_expression": "LGPL-2.0-only",
-              "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "lgpl-2.0_bare_id.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_bare_id.RULE"
             }
           ],
@@ -663,17 +659,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "component-package/package/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "component-package/package/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -708,17 +704,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/package/package.json",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "component-package/package/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
@@ -779,17 +775,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "component-package/package/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/package/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -850,17 +846,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "component-package/package/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "component-package/package/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1336.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1336.RULE"
             }
           ],
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 21ae491301a..d6c01a8aff5 100644
--- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
@@ -9,34 +9,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 50.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_2.RULE",
           "rule_relevance": 50,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
-          "matched_text": null
+          "rule_identifier": "license-intro_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -47,34 +45,32 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "license-holder-rollup/clear-majority/dir1/file1",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl_208.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "license-holder-rollup/clear-majority/dir1/file1",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
         }
       ]
     }
@@ -267,31 +263,31 @@
           "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "license-holder-rollup/clear-majority/dir1/file1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/clear-majority/dir1/file1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_208.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "license-holder-rollup/clear-majority/dir1/file1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/clear-majority/dir1/file1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
             }
           ],
@@ -424,31 +420,31 @@
           "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "license-holder-rollup/no-majority/bar/qux",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/no-majority/bar/qux",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_208.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "license-holder-rollup/no-majority/bar/qux",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/no-majority/bar/qux",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
             }
           ],
@@ -546,31 +542,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "license-holder-rollup/no-majority/foo/baz",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/no-majority/foo/baz",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "license-intro_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "license-holder-rollup/no-majority/foo/baz",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "license-holder-rollup/no-majority/foo/baz",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
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 5158e813bbd..dc522e6c62c 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
@@ -9,34 +9,32 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "multiple-same-holder-and-license/bar",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1074.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_1074.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "multiple-same-holder-and-license/bar",
           "start_line": 5,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_1074.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_1074.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
         }
       ]
     }
@@ -127,31 +125,31 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "multiple-same-holder-and-license/bar",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "multiple-same-holder-and-license/bar",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "multiple-same-holder-and-license/bar",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "multiple-same-holder-and-license/bar",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
             }
           ],
@@ -222,31 +220,31 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "multiple-same-holder-and-license/foo",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "multiple-same-holder-and-license/foo",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "multiple-same-holder-and-license/foo",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "multiple-same-holder-and-license/foo",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_1074.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_1074.RULE"
             }
           ],
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 758bce13a61..0eccbc7c8d2 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
@@ -32,17 +32,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/package/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package-files-not-counted-in-license-holders/package/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -79,19 +79,18 @@
       "detection_count": 6,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -102,19 +101,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     }
@@ -263,17 +261,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "package-files-not-counted-in-license-holders/package/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "package-files-not-counted-in-license-holders/package/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -308,17 +306,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/package/package.json",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "package-files-not-counted-in-license-holders/package/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
@@ -381,17 +379,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/package/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package-files-not-counted-in-license-holders/package/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -454,17 +452,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/package/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package-files-not-counted-in-license-holders/package/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -527,17 +525,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/package/src3",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package-files-not-counted-in-license-holders/package/src3",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -598,17 +596,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package-files-not-counted-in-license-holders/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -669,17 +667,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-files-not-counted-in-license-holders/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package-files-not-counted-in-license-holders/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
index 590d47a2e62..acad10eaf2d 100644
--- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -79,19 +79,18 @@
       "detection_count": 4,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "package/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": "apache-2.0"
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -102,19 +101,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "package/package.json",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     }
@@ -228,17 +226,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "package/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "package/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -273,17 +271,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/package.json",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "package/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
@@ -332,17 +330,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/src1",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package/src1",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -405,17 +403,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/src2",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package/src2",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -478,17 +476,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/src3",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "package/src3",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
index 622a6a34116..26326e38a99 100644
--- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-manifest/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package-manifest/package.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -79,19 +79,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "package-manifest/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": "apache-2.0"
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -102,19 +101,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "package-manifest/package.json",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     }
@@ -209,17 +207,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "package-manifest/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "package-manifest/package.json",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -254,17 +252,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package-manifest/package.json",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "package-manifest/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
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 b459a2fc22a..b68d14b51a8 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
@@ -9,19 +9,18 @@
       "detection_count": 4,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "report-subdirectory-with-minority-origin/b",
           "start_line": 3,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -128,17 +127,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "report-subdirectory-with-minority-origin/b",
               "start_line": 3,
               "end_line": 7,
-              "from_file": "report-subdirectory-with-minority-origin/b",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -199,17 +198,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "report-subdirectory-with-minority-origin/c",
               "start_line": 3,
               "end_line": 7,
-              "from_file": "report-subdirectory-with-minority-origin/c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -270,17 +269,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "report-subdirectory-with-minority-origin/d",
               "start_line": 3,
               "end_line": 7,
-              "from_file": "report-subdirectory-with-minority-origin/d",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -378,17 +377,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "report-subdirectory-with-minority-origin/minority_holder/a",
               "start_line": 3,
               "end_line": 7,
-              "from_file": "report-subdirectory-with-minority-origin/minority_holder/a",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
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 21f03190096..b5c0c035f49 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
@@ -9,34 +9,32 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 50.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "license-intro_2.RULE",
           "rule_relevance": 50,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE",
-          "matched_text": null
+          "rule_identifier": "license-intro_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -47,34 +45,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "return-nested-local-majority/foo/local-majority/baz",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl_208.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "return-nested-local-majority/foo/local-majority/baz",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
         }
       ]
     }
@@ -216,31 +212,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "return-nested-local-majority/foo/bar",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/bar",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "license-intro_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "return-nested-local-majority/foo/bar",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/bar",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -301,31 +297,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "return-nested-local-majority/foo/bax",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/bax",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "license-intro_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "return-nested-local-majority/foo/bax",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/bax",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
@@ -423,31 +419,31 @@
           "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "return-nested-local-majority/foo/local-majority/baz",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/local-majority/baz",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_208.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "return-nested-local-majority/foo/local-majority/baz",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/local-majority/baz",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
             }
           ],
@@ -508,31 +504,31 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "return-nested-local-majority/foo/qux",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/qux",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "license-intro_2.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "license-intro_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "return-nested-local-majority/foo/qux",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "return-nested-local-majority/foo/qux",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
             }
           ],
diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json
index fe3edec825d..cc6d7cf8c82 100644
--- a/tests/summarycode/data/score/basic-expected.json
+++ b/tests/summarycode/data/score/basic-expected.json
@@ -52,17 +52,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "basic/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "basic/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -282,19 +282,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "basic/index.js",
           "start_line": 2,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -305,19 +304,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "basic/package.json",
           "start_line": 7,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -328,19 +326,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "basic/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     }
@@ -421,17 +418,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "basic/README.md",
               "start_line": 20,
               "end_line": 37,
-              "from_file": "basic/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -496,17 +493,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "basic/index.js",
               "start_line": 2,
               "end_line": 19,
-              "from_file": "basic/index.js",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -595,17 +592,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "basic/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "basic/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -776,17 +773,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "basic/package.json",
               "start_line": 7,
               "end_line": 7,
-              "from_file": "basic/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
index 363c233d67b..e8749a7f0d9 100644
--- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
+++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -52,17 +52,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "inconsistent_licenses_copyleft/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "inconsistent_licenses_copyleft/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -282,19 +282,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "inconsistent_licenses_copyleft/util.js",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 8,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": null
+          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
+          "rule_url": null
         }
       ]
     },
@@ -305,19 +304,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "inconsistent_licenses_copyleft/index.js",
           "start_line": 2,
           "end_line": 19,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -328,19 +326,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "inconsistent_licenses_copyleft/package.json",
           "start_line": 7,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -351,19 +348,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "inconsistent_licenses_copyleft/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     }
@@ -444,17 +440,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "inconsistent_licenses_copyleft/README.md",
               "start_line": 20,
               "end_line": 37,
-              "from_file": "inconsistent_licenses_copyleft/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -519,17 +515,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "inconsistent_licenses_copyleft/index.js",
               "start_line": 2,
               "end_line": 19,
-              "from_file": "inconsistent_licenses_copyleft/index.js",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -618,17 +614,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "inconsistent_licenses_copyleft/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "inconsistent_licenses_copyleft/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -799,17 +795,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "inconsistent_licenses_copyleft/package.json",
               "start_line": 7,
               "end_line": 7,
-              "from_file": "inconsistent_licenses_copyleft/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -868,17 +864,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "inconsistent_licenses_copyleft/util.js",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "inconsistent_licenses_copyleft/util.js",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-3f844e1a237b3ca425edf1127a3c075a0a0c1de6",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-3f844e1a237b3ca425edf1127a3c075a0a0c1de6",
               "rule_url": null
             }
           ],
diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json
index 5f8419010df..cbc93959540 100644
--- a/tests/summarycode/data/score/jar-expected.json
+++ b/tests/summarycode/data/score/jar-expected.json
@@ -44,32 +44,32 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "- name: Apache License, version 2.0"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_42.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_42.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
               "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -235,19 +235,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "jar/META-INF/LICENSE.txt",
           "start_line": 2,
           "end_line": 202,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1584,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE"
         }
       ]
     },
@@ -258,19 +257,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 85,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_7.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
         }
       ]
     },
@@ -281,19 +279,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 25,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1227.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_1227.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE"
         }
       ]
     },
@@ -304,34 +301,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_48.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
-          "matched_text": "- name: Apache License, version 2.0"
+          "rule_identifier": "apache-2.0_48.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_42.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
-          "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
+          "rule_identifier": "apache-2.0_42.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE"
         }
       ]
     }
@@ -496,17 +491,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/LICENSE.txt",
               "start_line": 2,
               "end_line": 202,
-              "from_file": "jar/META-INF/LICENSE.txt",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1584,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE"
             }
           ],
@@ -580,17 +575,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jar/META-INF/LICENSE.txt",
                   "start_line": 2,
                   "end_line": 202,
-                  "from_file": "jar/META-INF/LICENSE.txt",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1584,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE"
                 }
               ],
@@ -893,32 +888,32 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "- name: Apache License, version 2.0"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
                   "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -1051,17 +1046,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
               "start_line": 24,
               "end_line": 30,
-              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 25,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1227.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1227.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1227.RULE"
             }
           ],
@@ -1237,17 +1232,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/org/jboss/logging/AbstractLoggerProvider.java",
               "start_line": 6,
               "end_line": 16,
-              "from_file": "jar/org/jboss/logging/AbstractLoggerProvider.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 85,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
             }
           ],
@@ -1312,17 +1307,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/org/jboss/logging/AbstractMdcLoggerProvider.java",
               "start_line": 6,
               "end_line": 16,
-              "from_file": "jar/org/jboss/logging/AbstractMdcLoggerProvider.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 85,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
             }
           ],
diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json
index 778a077b0ce..18724605861 100644
--- a/tests/summarycode/data/score/no_license_ambiguity-expected.json
+++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json
@@ -59,17 +59,17 @@
           "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
+              "from_file": "no_license_ambiguity/Cargo.toml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "no_license_ambiguity/Cargo.toml",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit OR apache-2.0",
-              "spdx_license_expression": "MIT OR Apache-2.0",
-              "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
               "matched_text": "MIT OR Apache-2.0"
             }
@@ -106,19 +106,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "no_license_ambiguity/LICENSE-APACHE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_875.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_875.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE"
         }
       ]
     },
@@ -129,34 +128,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 94.12,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "no_license_ambiguity/COPYRIGHT",
           "start_line": 1,
           "end_line": 7,
+          "matcher": "3-seq",
+          "score": 94.12,
           "matched_length": 48,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_1060.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_1060.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE"
         },
         {
-          "score": 97.83,
+          "license_expression": "apache-2.0 OR mit",
+          "license_expression_spdx": "Apache-2.0 OR MIT",
           "from_file": "no_license_ambiguity/COPYRIGHT",
           "start_line": 6,
           "end_line": 9,
+          "matcher": "3-seq",
+          "score": 97.83,
           "matched_length": 45,
           "match_coverage": 100.0,
-          "matcher": "3-seq",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_47.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_47.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE"
         }
       ]
     },
@@ -167,49 +164,46 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 57.69,
+          "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": 157,
+          "matcher": "3-seq",
+          "score": 57.69,
           "matched_length": 15,
           "match_coverage": 57.69,
-          "matcher": "3-seq",
-          "license_expression": "mit OR apache-2.0",
-          "license_expression_spdx": "MIT OR Apache-2.0",
-          "rule_identifier": "mit_or_apache-2.0_9.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_or_apache-2.0_9.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "no_license_ambiguity/README.md",
           "start_line": 157,
           "end_line": 157,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_154.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_154.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "no_license_ambiguity/LICENSE-MIT",
           "start_line": 4,
           "end_line": 26,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -220,19 +214,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "no_license_ambiguity/LICENSE-MIT",
           "start_line": 4,
           "end_line": 26,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -243,19 +236,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit OR apache-2.0",
-          "license_expression_spdx": "MIT OR Apache-2.0",
-          "rule_identifier": "mit_or_apache-2.0_15.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
-          "matched_text": "MIT OR Apache-2.0"
+          "rule_identifier": "mit_or_apache-2.0_15.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE"
         }
       ]
     },
@@ -266,19 +258,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit OR apache-2.0",
-          "license_expression_spdx": "MIT OR Apache-2.0",
-          "rule_identifier": "mit_or_apache-2.0_14.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_or_apache-2.0_14.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE"
         }
       ]
     }
@@ -396,31 +387,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 94.12,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "no_license_ambiguity/COPYRIGHT",
               "start_line": 1,
               "end_line": 7,
-              "from_file": "no_license_ambiguity/COPYRIGHT",
+              "matcher": "3-seq",
+              "score": 94.12,
               "matched_length": 48,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1060.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1060.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1060.RULE"
             },
             {
-              "score": 97.83,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "no_license_ambiguity/COPYRIGHT",
               "start_line": 6,
               "end_line": 9,
-              "from_file": "no_license_ambiguity/COPYRIGHT",
+              "matcher": "3-seq",
+              "score": 97.83,
               "matched_length": 45,
               "match_coverage": 100.0,
-              "matcher": "3-seq",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_47.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_47.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_47.RULE"
             }
           ],
@@ -504,17 +495,17 @@
               "license_expression_spdx": "MIT OR Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit OR apache-2.0",
+                  "spdx_license_expression": "MIT OR Apache-2.0",
+                  "from_file": "no_license_ambiguity/Cargo.toml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "no_license_ambiguity/Cargo.toml",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit OR apache-2.0",
-                  "spdx_license_expression": "MIT OR Apache-2.0",
-                  "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
                   "matched_text": "MIT OR Apache-2.0"
                 }
@@ -554,17 +545,17 @@
           "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
+              "from_file": "no_license_ambiguity/Cargo.toml",
               "start_line": 5,
               "end_line": 5,
-              "from_file": "no_license_ambiguity/Cargo.toml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit OR apache-2.0",
-              "spdx_license_expression": "MIT OR Apache-2.0",
-              "rule_identifier": "mit_or_apache-2.0_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_apache-2.0_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_14.RULE"
             }
           ],
@@ -633,17 +624,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "no_license_ambiguity/LICENSE-APACHE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "no_license_ambiguity/LICENSE-APACHE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_875.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_875.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_875.RULE"
             }
           ],
@@ -694,17 +685,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "no_license_ambiguity/LICENSE-MIT",
               "start_line": 4,
               "end_line": 26,
-              "from_file": "no_license_ambiguity/LICENSE-MIT",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -772,45 +763,45 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 57.69,
+              "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
+              "from_file": "no_license_ambiguity/README.md",
               "start_line": 152,
               "end_line": 157,
-              "from_file": "no_license_ambiguity/README.md",
+              "matcher": "3-seq",
+              "score": 57.69,
               "matched_length": 15,
               "match_coverage": 57.69,
-              "matcher": "3-seq",
-              "license_expression": "mit OR apache-2.0",
-              "spdx_license_expression": "MIT OR Apache-2.0",
-              "rule_identifier": "mit_or_apache-2.0_9.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_apache-2.0_9.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_9.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "no_license_ambiguity/README.md",
               "start_line": 157,
               "end_line": 157,
-              "from_file": "no_license_ambiguity/README.md",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_154.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_154.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_154.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "no_license_ambiguity/LICENSE-MIT",
               "start_line": 4,
               "end_line": 26,
-              "from_file": "no_license_ambiguity/LICENSE-MIT",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json
index 56bc4d590fd..0fd63f6b1c4 100644
--- a/tests/summarycode/data/score/no_license_text-expected.json
+++ b/tests/summarycode/data/score/no_license_text-expected.json
@@ -52,17 +52,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "no_license_text/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "no_license_text/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -282,19 +282,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "no_license_text/package.json",
           "start_line": 7,
           "end_line": 7,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -305,19 +304,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "no_license_text/package.json",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     }
@@ -516,17 +514,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "no_license_text/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "no_license_text/package.json",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -697,17 +695,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "no_license_text/package.json",
               "start_line": 7,
               "end_line": 7,
-              "from_file": "no_license_text/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
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 0baba0b2c23..c14fa103743 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
@@ -56,19 +56,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -79,34 +78,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/src/a.py",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -117,49 +114,46 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus",
+          "license_expression_spdx": "GPL-1.0-or-later",
           "from_file": "codebase/tests/test_a.py",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-1.0-plus",
-          "license_expression_spdx": "GPL-1.0-or-later",
-          "rule_identifier": "gpl_208.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl_208.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0",
+          "license_expression_spdx": "GPL-2.0-only",
           "from_file": "codebase/tests/test_a.py",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0",
-          "license_expression_spdx": "GPL-2.0-only",
-          "rule_identifier": "gpl-2.0_840.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0_840.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
         },
         {
-          "score": 50.0,
+          "license_expression": "gpl-2.0-plus",
+          "license_expression_spdx": "GPL-2.0-or-later",
           "from_file": "codebase/tests/test_a.py",
           "start_line": 2,
           "end_line": 2,
+          "matcher": "2-aho",
+          "score": 50.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
           "rule_relevance": 50,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
-          "matched_text": null
+          "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE"
         }
       ]
     },
@@ -170,19 +164,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -312,17 +305,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "codebase/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -373,17 +366,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "codebase/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -473,31 +466,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/src/a.py",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/src/a.py",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "codebase/src/a.py",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/src/a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -609,45 +602,45 @@
           "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "codebase/tests/test_a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "codebase/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_208.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl_208.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_208.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "codebase/tests/test_a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "codebase/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_840.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_840.RULE"
             },
             {
-              "score": 50.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "codebase/tests/test_a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "codebase/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-or-later_for_gpl-2.0-plus.RULE"
             }
           ],
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 a8637269d2e..2eef2da34a6 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
@@ -44,19 +44,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_119.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_119.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
         }
       ]
     },
@@ -67,19 +66,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
           "start_line": 1,
           "end_line": 12,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
         }
       ]
     }
@@ -275,17 +273,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
               "start_line": 1,
               "end_line": 12,
-              "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
             }
           ],
@@ -492,17 +490,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
               "start_line": 8,
               "end_line": 19,
-              "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
             }
           ],
diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json
index 363e3ced376..5ebb659efef 100644
--- a/tests/summarycode/data/summary/holders/clear_holder.expected.json
+++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json
@@ -44,19 +44,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -67,34 +66,32 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "clear_holder/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -105,19 +102,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "clear_holder/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -196,31 +192,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "clear_holder/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "clear_holder/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "clear_holder/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "clear_holder/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -293,17 +289,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "clear_holder/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "clear_holder/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -354,17 +350,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "clear_holder/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "clear_holder/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -454,31 +450,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "clear_holder/src/a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "clear_holder/src/a.py",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "clear_holder/src/a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "clear_holder/src/a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -580,31 +576,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "clear_holder/tests/test_a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "clear_holder/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "clear_holder/tests/test_a.py",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "clear_holder/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json
index ea3929f411b..0b4b3573b3b 100644
--- a/tests/summarycode/data/summary/holders/combined_holders.expected.json
+++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json
@@ -40,19 +40,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -63,34 +62,32 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "combined_holders/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -101,19 +98,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "combined_holders/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -192,31 +188,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "combined_holders/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "combined_holders/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "combined_holders/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "combined_holders/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -289,17 +285,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "combined_holders/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "combined_holders/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -350,17 +346,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "combined_holders/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "combined_holders/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -450,31 +446,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "combined_holders/src/a.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "combined_holders/src/a.py",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "combined_holders/src/a.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "combined_holders/src/a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -564,31 +560,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "combined_holders/tests/test_a.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "combined_holders/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "combined_holders/tests/test_a.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "combined_holders/tests/test_a.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
index 47079be7f37..33aa7aa0641 100644
--- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
@@ -44,19 +44,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "ambiguous/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -67,19 +66,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "ambiguous/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -209,17 +207,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "ambiguous/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "ambiguous/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -270,17 +268,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "ambiguous/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "ambiguous/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
index 5fc9e68051a..7107720a0c5 100644
--- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
@@ -40,19 +40,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "unambiguous/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -63,34 +62,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "unambiguous/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -101,19 +98,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "unambiguous/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -192,31 +188,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "unambiguous/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "unambiguous/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "unambiguous/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "unambiguous/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -279,17 +275,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "unambiguous/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "unambiguous/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -340,17 +336,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "unambiguous/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "unambiguous/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
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 725139bdc81..c11fb3a5f0d 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
@@ -75,17 +75,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/cargo.toml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "codebase/cargo.toml",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -152,17 +152,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "codebase/setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -199,19 +199,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -222,19 +221,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": "apache-2.0"
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -245,19 +243,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/setup.py",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     },
@@ -268,34 +265,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -306,19 +301,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/cargo.toml",
           "start_line": 4,
           "end_line": 4,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -329,19 +323,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/cargo.toml",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     },
@@ -352,19 +345,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -445,31 +437,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -534,17 +526,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "codebase/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -621,17 +613,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "codebase/cargo.toml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "codebase/cargo.toml",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -672,17 +664,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/cargo.toml",
               "start_line": 4,
               "end_line": 4,
-              "from_file": "codebase/cargo.toml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -741,17 +733,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "codebase/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -828,17 +820,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "codebase/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "codebase/setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -878,17 +870,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
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 26704702d2c..cc29e8ff9fa 100644
--- a/tests/summarycode/data/summary/single_file/single_file.expected.json
+++ b/tests/summarycode/data/summary/single_file/single_file.expected.json
@@ -26,19 +26,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "jetty",
+          "license_expression_spdx": "LicenseRef-scancode-jetty",
           "from_file": "codebase/jetty.LICENSE",
           "start_line": 1,
           "end_line": 132,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 996,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "jetty",
-          "license_expression_spdx": "LicenseRef-scancode-jetty",
-          "rule_identifier": "jetty.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE",
-          "matched_text": null
+          "rule_identifier": "jetty.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE"
         }
       ]
     }
@@ -117,17 +116,17 @@
           "license_expression_spdx": "LicenseRef-scancode-jetty",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "jetty",
+              "spdx_license_expression": "LicenseRef-scancode-jetty",
+              "from_file": "codebase/jetty.LICENSE",
               "start_line": 1,
               "end_line": 132,
-              "from_file": "codebase/jetty.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 996,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "jetty",
-              "spdx_license_expression": "LicenseRef-scancode-jetty",
-              "rule_identifier": "jetty.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "jetty.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/jetty.LICENSE"
             }
           ],
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 32dfabd36ca..28ef4b2f588 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
@@ -67,17 +67,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -89,17 +89,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -139,19 +139,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 13,
           "end_line": 13,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
         }
       ]
     },
@@ -162,49 +161,46 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -215,19 +211,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 1,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
           "rule_relevance": 100,
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
+          "rule_url": null
         }
       ]
     },
@@ -238,19 +233,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -261,19 +255,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/PKG-INFO",
           "start_line": 6,
           "end_line": 6,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -284,34 +277,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "unknown-license-reference",
-          "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE",
-          "matched_text": null
+          "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/LICENSE.txt",
           "start_line": 3,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -322,34 +313,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/setup.py",
           "start_line": 31,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 2,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit_30.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_identifier": "mit_30.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "pip-22.0.4/setup.py",
           "start_line": 35,
           "end_line": 35,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "pypi_mit_license.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
-          "matched_text": null
+          "rule_identifier": "pypi_mit_license.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
         }
       ]
     }
@@ -411,17 +400,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -519,17 +508,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/PKG-INFO",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -541,17 +530,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/PKG-INFO",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -594,17 +583,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 6,
               "end_line": 6,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             }
           ],
@@ -615,17 +604,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 13,
               "end_line": 13,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
@@ -636,31 +625,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 25,
               "end_line": 25,
-              "from_file": "pip-22.0.4/PKG-INFO",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -977,17 +966,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
@@ -1061,45 +1050,45 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "pip-22.0.4/setup.cfg",
                   "start_line": 87,
                   "end_line": 87,
-                  "from_file": "pip-22.0.4/setup.cfg",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/LICENSE.txt",
                   "start_line": 3,
                   "end_line": 20,
-                  "from_file": "pip-22.0.4/LICENSE.txt",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 161,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
                 }
               ],
@@ -1141,45 +1130,45 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "pip-22.0.4/setup.cfg",
               "start_line": 87,
               "end_line": 87,
-              "from_file": "pip-22.0.4/setup.cfg",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_2.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/LICENSE.txt",
               "start_line": 3,
               "end_line": 20,
-              "from_file": "pip-22.0.4/LICENSE.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -1242,17 +1231,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/setup.py",
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1264,17 +1253,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "pip-22.0.4/setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -1318,31 +1307,31 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/setup.py",
               "start_line": 31,
               "end_line": 31,
-              "from_file": "pip-22.0.4/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_30.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_30.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/setup.py",
               "start_line": 35,
               "end_line": 35,
-              "from_file": "pip-22.0.4/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE"
             }
           ],
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 2634caf6bbf..855448db8c1 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
@@ -67,17 +67,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 4,
               "end_line": 14,
-              "from_file": "codebase/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 85,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
             }
           ],
@@ -128,19 +128,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/setup.py",
           "start_line": 4,
           "end_line": 14,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 85,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_7.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_7.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
         }
       ]
     }
@@ -298,17 +297,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "codebase/setup.py",
                   "start_line": 4,
                   "end_line": 14,
-                  "from_file": "codebase/setup.py",
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 85,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_7.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_7.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
                 }
               ],
@@ -358,17 +357,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 4,
               "end_line": 14,
-              "from_file": "codebase/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 85,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE"
             }
           ],
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 e8493fb5ea0..75a7fe9d75e 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
@@ -71,17 +71,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "codebase/setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
@@ -118,19 +118,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -141,19 +140,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/setup.py",
           "start_line": 1,
           "end_line": 1,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 3,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-          "matched_text": "apache-2.0"
+          "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
         }
       ]
     },
@@ -164,19 +162,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/setup.py",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_65.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_65.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
     },
@@ -187,34 +184,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -225,19 +220,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -318,31 +312,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -407,17 +401,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "codebase/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -470,17 +464,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "codebase/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
@@ -557,17 +551,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "codebase/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "codebase/setup.py",
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "apache-2.0"
                 }
@@ -607,17 +601,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/setup.py",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/setup.py",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_65.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_65.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ],
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 9b7987ccbbc..7330b990871 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
@@ -40,19 +40,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/apache-2.0.LICENSE",
           "start_line": 1,
           "end_line": 176,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 1410,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_93.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_93.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
         }
       ]
     },
@@ -63,34 +62,32 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 80.0,
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
           "from_file": "codebase/README.txt",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 80.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0",
-          "license_expression_spdx": "Apache-2.0",
-          "rule_identifier": "apache-2.0_73.RULE",
           "rule_relevance": 80,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_73.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
         },
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "apache-2.0 OR mit",
-          "license_expression_spdx": "Apache-2.0 OR MIT",
-          "rule_identifier": "apache-2.0_or_mit_36.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE",
-          "matched_text": null
+          "rule_identifier": "apache-2.0_or_mit_36.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
         }
       ]
     },
@@ -101,19 +98,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit",
+          "license_expression_spdx": "MIT",
           "from_file": "codebase/mit.LICENSE",
           "start_line": 1,
           "end_line": 18,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 161,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "mit",
-          "license_expression_spdx": "MIT",
-          "rule_identifier": "mit.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_identifier": "mit.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     }
@@ -192,31 +188,31 @@
           "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 80.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_73.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "apache-2.0_73.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0 OR mit",
+              "spdx_license_expression": "Apache-2.0 OR MIT",
+              "from_file": "codebase/README.txt",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "codebase/README.txt",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0 OR mit",
-              "spdx_license_expression": "Apache-2.0 OR MIT",
-              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_or_mit_36.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE"
             }
           ],
@@ -279,17 +275,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "codebase/apache-2.0.LICENSE",
               "start_line": 1,
               "end_line": 176,
-              "from_file": "codebase/apache-2.0.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1410,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_93.RULE"
             }
           ],
@@ -340,17 +336,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/mit.LICENSE",
               "start_line": 1,
               "end_line": 18,
-              "from_file": "codebase/mit.LICENSE",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 161,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "mit.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
             }
           ],
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 e1aa84e0ed4..21de9384488 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
@@ -9,19 +9,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus",
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus",
-          "license_expression_spdx": "GPL-2.0-or-later",
-          "rule_identifier": "gpl-2.0-plus_119.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_119.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
         }
       ]
     },
@@ -32,19 +31,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-3.0-plus",
+          "license_expression_spdx": "GPL-3.0-or-later",
           "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
           "start_line": 1,
           "end_line": 12,
+          "matcher": "1-hash",
+          "score": 100.0,
           "matched_length": 102,
           "match_coverage": 100.0,
-          "matcher": "1-hash",
-          "license_expression": "gpl-3.0-plus",
-          "license_expression_spdx": "GPL-3.0-or-later",
-          "rule_identifier": "gpl-3.0-plus_290.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-3.0-plus_290.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
         }
       ]
     }
@@ -308,17 +306,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
               "start_line": 1,
               "end_line": 12,
-              "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_290.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_290.RULE"
             }
           ],
@@ -534,17 +532,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
               "start_line": 8,
               "end_line": 19,
-              "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 102,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_119.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_119.RULE"
             }
           ],
diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
index 62fed533624..5924e154986 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
@@ -2215,17 +2215,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "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"
             }
@@ -3341,19 +3341,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 50.0,
+          "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,
-          "matcher": "1-hash",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
-          "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"
+          "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"
         }
       ]
     },
@@ -3364,19 +3363,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 198,
           "end_line": 198,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": null
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
         }
       ]
     },
@@ -3387,19 +3385,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
           "start_line": 4,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 32,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "boost-1.0",
-          "license_expression_spdx": "BSL-1.0",
-          "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
-          "matched_text": null
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
         }
       ]
     },
@@ -3410,19 +3407,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-2.5",
-          "license_expression_spdx": "CC-BY-2.5",
-          "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
-          "matched_text": null
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
         }
       ]
     },
@@ -3433,19 +3429,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 99.69,
+          "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "from_file": "scan/cc0-1.0.LICENSE",
           "start_line": 1,
           "end_line": 98,
+          "matcher": "3-seq",
+          "score": 99.69,
           "matched_length": 978,
           "match_coverage": 99.69,
-          "matcher": "3-seq",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
-          "matched_text": null
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
         }
       ]
     },
@@ -3456,19 +3451,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus WITH ada-linking-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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 176,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
-          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
         }
       ]
     },
@@ -3479,19 +3473,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "scan/JGroups/src/FixedMembershipToken.java",
           "start_line": 7,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 125,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
         }
       ]
     },
@@ -3502,19 +3495,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "from_file": "scan/zlib/iostream2/zstream.h",
           "start_line": 9,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 71,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit-old-style",
-          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
-          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
-          "matched_text": null
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
         }
       ]
     },
@@ -3525,34 +3517,32 @@
       "detection_count": 7,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/adler32.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3563,19 +3553,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/infback9/infback9.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         }
       ]
     },
@@ -3586,19 +3575,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3609,19 +3597,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
           "start_line": 17,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": null
+          "rule_identifier": "zlib.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
         }
       ]
     }
@@ -3944,17 +3931,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4014,17 +4001,17 @@
           "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
+              "from_file": "scan/JGroups/src/GuardedBy.java",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/JGroups/src/GuardedBy.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-2.5",
-              "spdx_license_expression": "CC-BY-2.5",
-              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
             }
           ],
@@ -4090,17 +4077,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/ImmutableReference.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/ImmutableReference.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4244,17 +4231,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/RouterStubManager.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/RouterStubManager.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4428,31 +4415,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -4515,17 +4502,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -4585,31 +4572,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -4672,17 +4659,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 99.69,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "scan/cc0-1.0.LICENSE",
               "start_line": 1,
               "end_line": 98,
-              "from_file": "scan/cc0-1.0.LICENSE",
+              "matcher": "3-seq",
+              "score": 99.69,
               "matched_length": 978,
               "match_coverage": 99.69,
-              "matcher": "3-seq",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
             }
           ],
@@ -6934,17 +6921,17 @@
               "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "scan/package.json",
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "artistic-2.0",
-                  "spdx_license_expression": "Artistic-2.0",
-                  "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "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"
                 }
@@ -7750,17 +7737,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 198,
               "end_line": 198,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
             }
           ],
@@ -7886,17 +7873,17 @@
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
+              "from_file": "scan/zlib/ada/zlib.ads",
               "start_line": 6,
               "end_line": 25,
-              "from_file": "scan/zlib/ada/zlib.ads",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 176,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
-              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
             }
           ],
@@ -7956,31 +7943,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8043,31 +8030,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8130,31 +8117,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8301,17 +8288,17 @@
           "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
+              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 32,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "boost-1.0",
-              "spdx_license_expression": "BSL-1.0",
-              "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "boost-1.0_21.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
             }
           ],
@@ -8407,17 +8394,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
               "start_line": 17,
               "end_line": 31,
-              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
             }
           ],
@@ -8519,17 +8506,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -8589,17 +8576,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -8695,17 +8682,17 @@
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
+              "from_file": "scan/zlib/iostream2/zstream.h",
               "start_line": 9,
               "end_line": 15,
-              "from_file": "scan/zlib/iostream2/zstream.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 71,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit-old-style",
-              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
-              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
             }
           ],
@@ -8765,17 +8752,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8835,31 +8822,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8922,31 +8909,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
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 aa2d3b735b7..a94efb525c5 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
@@ -2215,17 +2215,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "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"
             }
@@ -3341,19 +3341,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 50.0,
+          "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,
-          "matcher": "1-hash",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
-          "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"
+          "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"
         }
       ]
     },
@@ -3364,19 +3363,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 198,
           "end_line": 198,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": null
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
         }
       ]
     },
@@ -3387,19 +3385,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
           "start_line": 4,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 32,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "boost-1.0",
-          "license_expression_spdx": "BSL-1.0",
-          "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
-          "matched_text": null
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
         }
       ]
     },
@@ -3410,19 +3407,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-2.5",
-          "license_expression_spdx": "CC-BY-2.5",
-          "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
-          "matched_text": null
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
         }
       ]
     },
@@ -3433,19 +3429,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 99.69,
+          "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "from_file": "scan/cc0-1.0.LICENSE",
           "start_line": 1,
           "end_line": 98,
+          "matcher": "3-seq",
+          "score": 99.69,
           "matched_length": 978,
           "match_coverage": 99.69,
-          "matcher": "3-seq",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
-          "matched_text": null
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
         }
       ]
     },
@@ -3456,19 +3451,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus WITH ada-linking-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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 176,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
-          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
         }
       ]
     },
@@ -3479,19 +3473,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "scan/JGroups/src/FixedMembershipToken.java",
           "start_line": 7,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 125,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
         }
       ]
     },
@@ -3502,19 +3495,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "from_file": "scan/zlib/iostream2/zstream.h",
           "start_line": 9,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 71,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit-old-style",
-          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
-          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
-          "matched_text": null
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
         }
       ]
     },
@@ -3525,34 +3517,32 @@
       "detection_count": 7,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/adler32.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3563,19 +3553,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/infback9/infback9.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         }
       ]
     },
@@ -3586,19 +3575,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3609,19 +3597,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
           "start_line": 17,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": null
+          "rule_identifier": "zlib.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
         }
       ]
     }
@@ -4206,17 +4193,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4287,17 +4274,17 @@
           "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
+              "from_file": "scan/JGroups/src/GuardedBy.java",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/JGroups/src/GuardedBy.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-2.5",
-              "spdx_license_expression": "CC-BY-2.5",
-              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
             }
           ],
@@ -4379,17 +4366,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/ImmutableReference.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/ImmutableReference.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4554,17 +4541,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/RouterStubManager.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/RouterStubManager.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4773,31 +4760,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -4865,17 +4852,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -4957,31 +4944,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -5049,17 +5036,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 99.69,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "scan/cc0-1.0.LICENSE",
               "start_line": 1,
               "end_line": 98,
-              "from_file": "scan/cc0-1.0.LICENSE",
+              "matcher": "3-seq",
+              "score": 99.69,
               "matched_length": 978,
               "match_coverage": 99.69,
-              "matcher": "3-seq",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
             }
           ],
@@ -7316,17 +7303,17 @@
               "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "scan/package.json",
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "artistic-2.0",
-                  "spdx_license_expression": "Artistic-2.0",
-                  "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "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"
                 }
@@ -8132,17 +8119,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 198,
               "end_line": 198,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
             }
           ],
@@ -8561,17 +8548,17 @@
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
+              "from_file": "scan/zlib/ada/zlib.ads",
               "start_line": 6,
               "end_line": 25,
-              "from_file": "scan/zlib/ada/zlib.ads",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 176,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
-              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
             }
           ],
@@ -8636,31 +8623,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8728,31 +8715,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -8820,31 +8807,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9004,17 +8991,17 @@
           "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
+              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 32,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "boost-1.0",
-              "spdx_license_expression": "BSL-1.0",
-              "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "boost-1.0_21.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
             }
           ],
@@ -9124,17 +9111,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
               "start_line": 17,
               "end_line": 31,
-              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
             }
           ],
@@ -9260,17 +9247,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -9335,17 +9322,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -9449,17 +9436,17 @@
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
+              "from_file": "scan/zlib/iostream2/zstream.h",
               "start_line": 9,
               "end_line": 15,
-              "from_file": "scan/zlib/iostream2/zstream.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 71,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit-old-style",
-              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
-              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
             }
           ],
@@ -9530,17 +9517,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9616,31 +9603,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9708,31 +9695,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
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 99f4ac39056..b03b1099a8c 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
@@ -2215,17 +2215,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
               "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"
             }
@@ -3341,19 +3341,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 50.0,
+          "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,
-          "matcher": "1-hash",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
           "rule_relevance": 50,
-          "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"
+          "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"
         }
       ]
     },
@@ -3364,19 +3363,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 198,
           "end_line": 198,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": null
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
         }
       ]
     },
@@ -3387,19 +3385,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
           "start_line": 4,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 32,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "boost-1.0",
-          "license_expression_spdx": "BSL-1.0",
-          "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
-          "matched_text": null
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
         }
       ]
     },
@@ -3410,19 +3407,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-2.5",
-          "license_expression_spdx": "CC-BY-2.5",
-          "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
-          "matched_text": null
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
         }
       ]
     },
@@ -3433,19 +3429,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 99.69,
+          "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "from_file": "scan/cc0-1.0.LICENSE",
           "start_line": 1,
           "end_line": 98,
+          "matcher": "3-seq",
+          "score": 99.69,
           "matched_length": 978,
           "match_coverage": 99.69,
-          "matcher": "3-seq",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
-          "matched_text": null
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
         }
       ]
     },
@@ -3456,19 +3451,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus WITH ada-linking-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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 176,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
-          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
         }
       ]
     },
@@ -3479,19 +3473,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "scan/JGroups/src/FixedMembershipToken.java",
           "start_line": 7,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 125,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
         }
       ]
     },
@@ -3502,19 +3495,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "from_file": "scan/zlib/iostream2/zstream.h",
           "start_line": 9,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 71,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit-old-style",
-          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
-          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
-          "matched_text": null
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
         }
       ]
     },
@@ -3525,34 +3517,32 @@
       "detection_count": 7,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/adler32.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3563,19 +3553,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/infback9/infback9.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         }
       ]
     },
@@ -3586,19 +3575,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -3609,19 +3597,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
           "start_line": 17,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": null
+          "rule_identifier": "zlib.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
         }
       ]
     }
@@ -4276,17 +4263,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4378,17 +4365,17 @@
           "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
+              "from_file": "scan/JGroups/src/GuardedBy.java",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/JGroups/src/GuardedBy.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-2.5",
-              "spdx_license_expression": "CC-BY-2.5",
-              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
             }
           ],
@@ -4486,17 +4473,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/ImmutableReference.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/ImmutableReference.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -4736,17 +4723,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/RouterStubManager.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/RouterStubManager.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -5064,31 +5051,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -5183,17 +5170,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -5285,31 +5272,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -5404,17 +5391,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 99.69,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "scan/cc0-1.0.LICENSE",
               "start_line": 1,
               "end_line": 98,
-              "from_file": "scan/cc0-1.0.LICENSE",
+              "matcher": "3-seq",
+              "score": 99.69,
               "matched_length": 978,
               "match_coverage": 99.69,
-              "matcher": "3-seq",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
             }
           ],
@@ -7698,17 +7685,17 @@
               "license_expression_spdx": "Artistic-2.0",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "artistic-2.0",
+                  "spdx_license_expression": "Artistic-2.0",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": "scan/package.json",
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "artistic-2.0",
-                  "spdx_license_expression": "Artistic-2.0",
-                  "rule_identifier": "spdx_license_id_artistic-2.0_for_artistic-2.0.RULE",
                   "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"
                 }
@@ -8514,17 +8501,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 198,
               "end_line": 198,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
             }
           ],
@@ -8821,17 +8808,17 @@
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
+              "from_file": "scan/zlib/ada/zlib.ads",
               "start_line": 6,
               "end_line": 25,
-              "from_file": "scan/zlib/ada/zlib.ads",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 176,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
-              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
             }
           ],
@@ -8923,31 +8910,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9042,31 +9029,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9161,31 +9148,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -9436,17 +9423,17 @@
           "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
+              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 32,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "boost-1.0",
-              "spdx_license_expression": "BSL-1.0",
-              "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "boost-1.0_21.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
             }
           ],
@@ -9606,17 +9593,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
               "start_line": 17,
               "end_line": 31,
-              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
             }
           ],
@@ -9782,17 +9769,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -9884,17 +9871,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -10054,17 +10041,17 @@
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
+              "from_file": "scan/zlib/iostream2/zstream.h",
               "start_line": 9,
               "end_line": 15,
-              "from_file": "scan/zlib/iostream2/zstream.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 71,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit-old-style",
-              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
-              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
             }
           ],
@@ -10156,17 +10143,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -10258,31 +10245,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -10377,31 +10364,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
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 80068c40193..02b14cbfb3c 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
@@ -52,8 +52,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "artistic-2.0_46.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
           }
         ]
       },
@@ -75,8 +74,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "boost-1.0_21.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
           }
         ]
       },
@@ -98,8 +96,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "cc-by-2.5_4.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
           }
         ]
       },
@@ -121,8 +118,7 @@
             "match_coverage": 99.69,
             "rule_relevance": 100,
             "rule_identifier": "cc0-1.0_155.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
           }
         ]
       },
@@ -144,8 +140,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
           }
         ]
       },
@@ -167,8 +162,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "lgpl-2.1-plus_59.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
           }
         ]
       },
@@ -190,8 +184,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "mit-old-style_cmr-no_1.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
           }
         ]
       },
@@ -213,8 +206,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "zlib_5.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
           },
           {
             "license_expression": "zlib",
@@ -228,8 +220,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "zlib_17.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
           }
         ]
       },
@@ -251,8 +242,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "zlib_5.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
           }
         ]
       },
@@ -274,8 +264,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "zlib_17.RULE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
           }
         ]
       },
@@ -297,8 +286,7 @@
             "match_coverage": 100.0,
             "rule_relevance": 100,
             "rule_identifier": "zlib.LICENSE",
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-            "matched_text": null
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
           }
         ]
       }
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 e6131af8af4..33f78b331ff 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
@@ -7,19 +7,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "artistic-2.0",
+          "license_expression_spdx": "Artistic-2.0",
           "from_file": "scan/package.json",
           "start_line": 198,
           "end_line": 198,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "artistic-2.0",
-          "license_expression_spdx": "Artistic-2.0",
-          "rule_identifier": "artistic-2.0_46.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE",
-          "matched_text": null
+          "rule_identifier": "artistic-2.0_46.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
         }
       ]
     },
@@ -30,19 +29,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "boost-1.0",
+          "license_expression_spdx": "BSL-1.0",
           "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
           "start_line": 4,
           "end_line": 5,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 32,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "boost-1.0",
-          "license_expression_spdx": "BSL-1.0",
-          "rule_identifier": "boost-1.0_21.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE",
-          "matched_text": null
+          "rule_identifier": "boost-1.0_21.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
         }
       ]
     },
@@ -53,19 +51,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "cc-by-2.5",
-          "license_expression_spdx": "CC-BY-2.5",
-          "rule_identifier": "cc-by-2.5_4.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE",
-          "matched_text": null
+          "rule_identifier": "cc-by-2.5_4.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
         }
       ]
     },
@@ -76,19 +73,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 99.69,
+          "license_expression": "cc0-1.0",
+          "license_expression_spdx": "CC0-1.0",
           "from_file": "scan/cc0-1.0.LICENSE",
           "start_line": 1,
           "end_line": 98,
+          "matcher": "3-seq",
+          "score": 99.69,
           "matched_length": 978,
           "match_coverage": 99.69,
-          "matcher": "3-seq",
-          "license_expression": "cc0-1.0",
-          "license_expression_spdx": "CC0-1.0",
-          "rule_identifier": "cc0-1.0_155.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE",
-          "matched_text": null
+          "rule_identifier": "cc0-1.0_155.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
         }
       ]
     },
@@ -99,19 +95,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0-plus WITH ada-linking-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,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 176,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-          "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
-          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE",
-          "matched_text": null
+          "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
         }
       ]
     },
@@ -122,19 +117,18 @@
       "detection_count": 3,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1-plus",
+          "license_expression_spdx": "LGPL-2.1-or-later",
           "from_file": "scan/JGroups/src/FixedMembershipToken.java",
           "start_line": 7,
           "end_line": 20,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 125,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "lgpl-2.1-plus",
-          "license_expression_spdx": "LGPL-2.1-or-later",
-          "rule_identifier": "lgpl-2.1-plus_59.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE",
-          "matched_text": null
+          "rule_identifier": "lgpl-2.1-plus_59.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
         }
       ]
     },
@@ -145,19 +139,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit-old-style",
+          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "from_file": "scan/zlib/iostream2/zstream.h",
           "start_line": 9,
           "end_line": 15,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 71,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "mit-old-style",
-          "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
-          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE",
-          "matched_text": null
+          "rule_identifier": "mit-old-style_cmr-no_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
         }
       ]
     },
@@ -168,34 +161,32 @@
       "detection_count": 7,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/adler32.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         },
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -206,19 +197,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/infback9/infback9.c",
           "start_line": 3,
           "end_line": 3,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 12,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_5.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_5.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
         }
       ]
     },
@@ -229,19 +219,18 @@
       "detection_count": 2,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/arch/zlib.h",
           "start_line": 6,
           "end_line": 23,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 144,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib_17.RULE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE",
-          "matched_text": null
+          "rule_identifier": "zlib_17.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
         }
       ]
     },
@@ -252,19 +241,18 @@
       "detection_count": 1,
       "sample_matches": [
         {
-          "score": 100.0,
+          "license_expression": "zlib",
+          "license_expression_spdx": "Zlib",
           "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
           "start_line": 17,
           "end_line": 31,
+          "matcher": "2-aho",
+          "score": 100.0,
           "matched_length": 132,
           "match_coverage": 100.0,
-          "matcher": "2-aho",
-          "license_expression": "zlib",
-          "license_expression_spdx": "Zlib",
-          "rule_identifier": "zlib.LICENSE",
           "rule_relevance": 100,
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
-          "matched_text": null
+          "rule_identifier": "zlib.LICENSE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
         }
       ]
     }
@@ -614,17 +602,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/FixedMembershipToken.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -685,17 +673,17 @@
           "license_expression_spdx": "CC-BY-2.5",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "cc-by-2.5",
+              "spdx_license_expression": "CC-BY-2.5",
+              "from_file": "scan/JGroups/src/GuardedBy.java",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/JGroups/src/GuardedBy.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 14,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "cc-by-2.5",
-              "spdx_license_expression": "CC-BY-2.5",
-              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc-by-2.5_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-2.5_4.RULE"
             }
           ],
@@ -762,17 +750,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/ImmutableReference.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/ImmutableReference.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -919,17 +907,17 @@
           "license_expression_spdx": "LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "scan/JGroups/src/RouterStubManager.java",
               "start_line": 7,
               "end_line": 20,
-              "from_file": "scan/JGroups/src/RouterStubManager.java",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 125,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_59.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_59.RULE"
             }
           ],
@@ -1107,31 +1095,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1195,17 +1183,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1266,31 +1254,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/arch/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/arch/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/arch/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1354,17 +1342,17 @@
           "license_expression_spdx": "CC0-1.0",
           "matches": [
             {
-              "score": 99.69,
+              "license_expression": "cc0-1.0",
+              "spdx_license_expression": "CC0-1.0",
+              "from_file": "scan/cc0-1.0.LICENSE",
               "start_line": 1,
               "end_line": 98,
-              "from_file": "scan/cc0-1.0.LICENSE",
+              "matcher": "3-seq",
+              "score": 99.69,
               "matched_length": 978,
               "match_coverage": 99.69,
-              "matcher": "3-seq",
-              "license_expression": "cc0-1.0",
-              "spdx_license_expression": "CC0-1.0",
-              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "cc0-1.0_155.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_155.RULE"
             }
           ],
@@ -1413,17 +1401,17 @@
           "license_expression_spdx": "Artistic-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "artistic-2.0",
+              "spdx_license_expression": "Artistic-2.0",
+              "from_file": "scan/package.json",
               "start_line": 198,
               "end_line": 198,
-              "from_file": "scan/package.json",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "artistic-2.0",
-              "spdx_license_expression": "Artistic-2.0",
-              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "artistic-2.0_46.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-2.0_46.RULE"
             }
           ],
@@ -1552,17 +1540,17 @@
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
+              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
+              "from_file": "scan/zlib/ada/zlib.ads",
               "start_line": 6,
               "end_line": 25,
-              "from_file": "scan/zlib/ada/zlib.ads",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 176,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
-              "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception",
-              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_with_ada-linking-exception_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_ada-linking-exception_1.RULE"
             }
           ],
@@ -1623,31 +1611,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/adler32.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/adler32.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1711,31 +1699,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1799,31 +1787,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/deflate.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/deflate.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -1973,17 +1961,17 @@
           "license_expression_spdx": "BSL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "boost-1.0",
+              "spdx_license_expression": "BSL-1.0",
+              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
               "start_line": 4,
               "end_line": 5,
-              "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 32,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "boost-1.0",
-              "spdx_license_expression": "BSL-1.0",
-              "rule_identifier": "boost-1.0_21.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "boost-1.0_21.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/boost-1.0_21.RULE"
             }
           ],
@@ -2081,17 +2069,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
               "start_line": 17,
               "end_line": 31,
-              "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 132,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE"
             }
           ],
@@ -2195,17 +2183,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -2266,17 +2254,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/infback9/infback9.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/infback9/infback9.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             }
           ],
@@ -2374,17 +2362,17 @@
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit-old-style",
+              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
+              "from_file": "scan/zlib/iostream2/zstream.h",
               "start_line": 9,
               "end_line": 15,
-              "from_file": "scan/zlib/iostream2/zstream.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 71,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit-old-style",
-              "spdx_license_expression": "LicenseRef-scancode-mit-old-style",
-              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit-old-style_cmr-no_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit-old-style_cmr-no_1.RULE"
             }
           ],
@@ -2445,17 +2433,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -2516,31 +2504,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.c",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.c",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
@@ -2604,31 +2592,31 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zutil.h",
               "start_line": 3,
               "end_line": 3,
-              "from_file": "scan/zlib/zutil.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 12,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_5.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_5.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_5.RULE"
             },
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "scan/zlib/zlib.h",
               "start_line": 6,
               "end_line": 23,
-              "from_file": "scan/zlib/zlib.h",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 144,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_17.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_17.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_17.RULE"
             }
           ],
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 aa6c04ceb6b..be8a0e5247d 100644
--- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
+++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
@@ -191,8 +191,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "mit_12.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE",
-          "matched_text": null
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_12.RULE"
         }
       ]
     },
@@ -214,8 +213,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "mit_30.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": "https://github.com/niklasvh/base64-arraybuffer/blob/master/LICENSE-MIT"
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     },
@@ -237,8 +235,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
-          "rule_url": null,
-          "matched_text": "MIT"
+          "rule_url": null
         }
       ]
     },
@@ -260,8 +257,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "mit.LICENSE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
-          "matched_text": null
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE"
         }
       ]
     },
@@ -283,8 +279,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "mit_272.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE",
-          "matched_text": null
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_272.RULE"
         },
         {
           "license_expression": "mit",
@@ -298,8 +293,7 @@
           "match_coverage": 100.0,
           "rule_relevance": 100,
           "rule_identifier": "mit_30.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
-          "matched_text": null
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE"
         }
       ]
     }
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 2d97ea813c9..ccda031a687 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
@@ -2,7 +2,7 @@
   "license_detections": [],
   "todo": [
     {
-      "detection_id": "borceux-3c39742c-edef-82b7-0cdd-fc4d9ff8b044",
+      "detection_id": "borceux-d99f172d-bc25-b4f7-b6bf-cccec1995ce5",
       "review_comments": {
         "imperfect-match-coverage": "The license detection likely is not conclusive as there was license matches with low score or coverage, and so this needs review. scancode would likely benifit from a license rule addition from this case, so please report this to scancode-toolkit github issues."
       },
@@ -27,14 +27,14 @@
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
             "rule_notes": null,
             "referenced_filenames": [],
-            "matched_text": "package consists of [various] [tarballs].\n\n[This] README",
+            "matched_text": "This src:package consists of various tarballs.\n\nThis README is a dummy file for creating the base tarball of the name",
             "rule_text": "Copyright 1993 Francis Borceux\nYou may freely use, modify, and/or distribute each of the files in this package without limitation.  The package consists of the following files:\n\nREADME\ncompatibility/OldDiagram\ncompatibility/OldMaxiDiagram\ncompatibility/OldMicroDiagram\ncompatibility/OldMiniDiagram\ncompatibility/OldMultipleArrows\ndiagram/Diagram\ndiagram/MaxiDiagram\ndiagram/MicroDiagram\ndiagram/MiniDiagram\ndiagram/MultipleArrows\nuser-guides/Diagram_Mode_d_Emploi\nuser-guides/Diagram_Read_Me\n\nOf course no support is guaranteed, but the author will attempt to assist with problems.  Current email address:\nfrancis dot borceux at uclouvain dot be."
           }
         ],
         "detection_log": [
           "low-quality-matches"
         ],
-        "identifier": "borceux-3c39742c-edef-82b7-0cdd-fc4d9ff8b044"
+        "identifier": "borceux-d99f172d-bc25-b4f7-b6bf-cccec1995ce5"
       }
     }
   ],
@@ -59,12 +59,13 @@
           "rule_relevance": 100,
           "rule_identifier": "borceux.LICENSE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/borceux.LICENSE",
-          "matched_text": "package consists of [various] [tarballs].\n\n[This] README"
+          "matched_text": "This src:package consists of various tarballs.\n\nThis README is a dummy file for creating the base tarball of the name",
+          "matched_text_diagnostics": "package consists of [various] [tarballs].\n\n[This] README"
         }
       ],
       "percentage_of_license_text": 10.53,
       "for_todo": [
-        "borceux-3c39742c-edef-82b7-0cdd-fc4d9ff8b044"
+        "borceux-d99f172d-bc25-b4f7-b6bf-cccec1995ce5"
       ],
       "scan_errors": []
     }
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 68387095e38..bf472b41a35 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
@@ -20,9 +20,10 @@
           "matched_length": 53,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
+          "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
           "rule_url": null,
-          "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
+          "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
+          "matched_text_diagnostics": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
         }
       ]
     }
@@ -50,12 +51,12 @@
             "rule_length": 53,
             "match_coverage": 100.0,
             "rule_relevance": 100,
-            "rule_identifier": "license-detection-unknown-3d4d4e847eacf4b9efcc80ca90df1eea689f5cee",
+            "rule_identifier": "license-detection-unknown-51bcd994ad60981fff8c5f1b1b9af6e3d4f5ba67",
             "rule_url": null,
             "rule_notes": "Unknown license based on a composite of license words.",
             "referenced_filenames": [],
-            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof.",
-            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
+            "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
+            "rule_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof."
           }
         ],
         "detection_log": [
@@ -89,7 +90,8 @@
               "rule_relevance": 100,
               "rule_identifier": "license-detection-unknown-296da2cbc15d2bba73baa1359cda5fc8bf39b942",
               "rule_url": null,
-              "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
+              "matched_text": "form shall mean the preferred form for making\nthe purposes of this definition control\nsoftware is modified by someone else\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.",
+              "matched_text_diagnostics": "form shall mean the preferred form for making\nthe purposes of this definition control\n[software] [is] [modified] [by] [someone] [else]\n\n\n\nrepresent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) [to] [the] interfaces of,\n      the Work and Derivative Works thereof."
             }
           ],
           "detection_log": [

From c631e7325a75cf471393d2ce60df03c863485e8a Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Wed, 10 Jan 2024 18:37:26 +0530
Subject: [PATCH 09/11] Fix SPDX rule identifer mismatch bug

Fixes the SPDX rule identifier mismatch bug by getting rid of
extra space introduced in SPDX license declaration detection
and text cleaning. Also enforce python safe names for identifiers.

Reference: https://github.com/nexB/scancode-toolkit/issues/3634
Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/licenses_reference.py        |   17 +-
 src/licensedcode/models.py                    |    9 +-
 src/licensedcode/query.py                     |    2 +-
 ...-matched-text-with-reference.expected.json |   24 +-
 .../scan-with-reference.expected.json         |   24 +-
 .../data/match_spdx/scan-expected.json        |    6 +-
 .../license-expression/scan.expected.json     |  266 +-
 .../spdx-expressions.expected.json            |  152 +-
 ...own-intro-eclipse-foundation.expected.json |   50 +-
 .../text/scan-diag.expected.json              |    8 +-
 .../plugin_license/text/scan.expected.json    |    8 +-
 .../text_long_lines/scan-diag.expected.json   |    8 +-
 .../text_long_lines/scan.expected.json        |    8 +-
 ...own-intro-eclipse-foundation.expected.json |    8 +-
 .../plugin_license_text/scan.expected.json    |    8 +-
 .../data/spdx/lines/basic.txt.json            |   98 +-
 .../data/spdx/lines/complex-readme.json       |    2 +-
 .../data/spdx/lines/complex-short.html.json   |    4 +-
 .../data/spdx/lines/complex.c.json            |    2 +-
 .../data/spdx/lines/complex.el.json           |    2 +-
 .../data/spdx/lines/complex.html.json         |    2 +-
 .../data/spdx/lines/complex.java.json         |    2 +-
 .../expression-with-notice-complex.java.json  |    2 +-
 .../lines/expression-with-notice.java.json    |    2 +-
 .../lines/expression-with-notice2.java.json   |    2 +-
 .../data/spdx/lines/genivi.c.json             |    2 +-
 .../data/spdx/lines/licence.c.json            |   14 +-
 .../licensedcode/data/spdx/lines/linux.c.json |   68 +-
 .../licensedcode/data/spdx/lines/misc.c.json  |   36 +-
 .../licensedcode/data/spdx/lines/misc2.c.json |   18 +-
 .../data/spdx/lines/misc2.java.json           |    2 +-
 .../licensedcode/data/spdx/lines/misc3.c.json |    4 +-
 .../spdx/lines/mit-with-disclaimer.c.json     |    2 +-
 .../data/spdx/lines/mixed.go.json             |    2 +-
 .../data/spdx/lines/mixed.java.json           |    2 +-
 .../data/spdx/lines/oldplus.txt.json          |    2 +-
 .../data/spdx/lines/reuse.py.json             |    2 +-
 .../data/spdx/lines/spdx-v3.txt.json          |    8 +-
 .../licensedcode/data/spdx/lines/uboot.c.json |   78 +-
 tests/licensedcode/test_match_spdx_lid.py     |   14 +-
 tests/licensedcode/test_plugin_license.py     |    7 +-
 ...r-layer.tar.xz-get-installed-expected.json |  178 +-
 ...-container-layer.tar.xz-scan-expected.json |  356 +-
 .../bluedevil/APKBUILD-expected.json          |   14 +-
 .../community/discover/APKBUILD-expected.json |   14 +-
 .../kactivitymanagerd/APKBUILD-expected.json  |   14 +-
 .../kde-cli-tools/APKBUILD-expected.json      |   14 +-
 .../kde-gtk-config/APKBUILD-expected.json     |   14 +-
 .../kdecoration/APKBUILD-expected.json        |   14 +-
 .../kdeplasma-addons/APKBUILD-expected.json   |   14 +-
 .../community/khotkeys/APKBUILD-expected.json |   14 +-
 .../kinfocenter/APKBUILD-expected.json        |   14 +-
 .../community/kscreen/APKBUILD-expected.json  |   14 +-
 .../kscreenlocker/APKBUILD-expected.json      |   14 +-
 .../APKBUILD-expected.json                    |   14 +-
 .../kwayland-server/APKBUILD-expected.json    |   14 +-
 .../community/kwin/APKBUILD-expected.json     |   14 +-
 .../layer-shell-qt/APKBUILD-expected.json     |   14 +-
 .../libkscreen/APKBUILD-expected.json         |   14 +-
 .../libksysguard/APKBUILD-expected.json       |   14 +-
 .../community/milou/APKBUILD-expected.json    |   14 +-
 .../plasma-desktop/APKBUILD-expected.json     |   14 +-
 .../plasma-integration/APKBUILD-expected.json |   14 +-
 .../plasma-nano/APKBUILD-expected.json        |   14 +-
 .../plasma-nm/APKBUILD-expected.json          |   14 +-
 .../plasma-pa/APKBUILD-expected.json          |   14 +-
 .../APKBUILD-expected.json                    |   14 +-
 .../APKBUILD-expected.json                    |   14 +-
 .../plasma-thunderbolt/APKBUILD-expected.json |   14 +-
 .../plasma-vault/APKBUILD-expected.json       |   14 +-
 .../plasma-workspace/APKBUILD-expected.json   |   14 +-
 .../powerdevil/APKBUILD-expected.json         |   14 +-
 .../qqc2-breeze-style/APKBUILD-expected.json  |   14 +-
 .../qt6-qtbase/APKBUILD-expected.json         |   14 +-
 .../community/sddm-kcm/APKBUILD-expected.json |   14 +-
 .../main/sqlite-tcl/APKBUILD-expected.json    |   14 +-
 .../main/sqlite/APKBUILD-expected.json        |   14 +-
 .../alpine14/main/sudo/APKBUILD-expected.json |   14 +-
 .../main/util-linux/APKBUILD-expected.json    |   14 +-
 .../community/haxe/APKBUILD-expected.json     |   14 +-
 .../linux-firmware/APKBUILD-expected.json     |   14 +-
 .../audacious-plugins/APKBUILD-expected.json  |   14 +-
 .../community/gcc6/APKBUILD-expected.json     |   14 +-
 .../community/qt6-qt3d/APKBUILD-expected.json |   14 +-
 .../alpine14/main/gcc/APKBUILD-expected.json  |   14 +-
 .../alpine14/main/icu/APKBUILD-expected.json  |   14 +-
 .../alpine14/main/ruby/APKBUILD-expected.json |   14 +-
 .../APKBUILD-expected.json                    |   14 +-
 .../APKBUILD-expected.json                    |   14 +-
 .../full-installed/installed-expected.json    |  178 +-
 .../rootfs/alpine-rootfs.tar.xz-expected.json |  360 +-
 .../small-installed/installed-expected.json   |  176 +-
 .../data/npm/chartist/package.json.expected   |   62 +-
 .../data/opam/sample4/output.opam.expected    |   14 +-
 .../data/opam/sample7/output.opam.expected    |   14 +-
 .../data/opam/sample8/output.opam.expected    |   14 +-
 .../phpcomposer/fake/composer.json.expected   |   14 +-
 .../scancode_toolkit.egg-info-expected.json   |   14 +-
 .../data/pypi/solo-metadata/expected.json     |   28 +-
 .../bdb-fedora-rootfs.tar.xz-expected.json    | 3556 ++++++++---------
 ...consistent_licenses_copyleft-expected.json |    8 +-
 101 files changed, 3499 insertions(+), 3094 deletions(-)

diff --git a/src/licensedcode/licenses_reference.py b/src/licensedcode/licenses_reference.py
index 24b2a932642..68b9ebf7b54 100644
--- a/src/licensedcode/licenses_reference.py
+++ b/src/licensedcode/licenses_reference.py
@@ -69,8 +69,8 @@ def process_codebase(self, codebase, **kwargs):
         Collect the ``license_references`` and ``rule_references``
         list of data mappings and add to the ``codebase``.
         """
-        include_files = 'license' in kwargs
-        include_packages = 'package' in kwargs
+        include_files = hasattr(codebase.attributes, 'license_detections')
+        include_packages = hasattr(codebase.attributes, 'packages')
 
         license_references, rule_references = collect_license_and_rule_references(
             codebase=codebase,
@@ -86,17 +86,24 @@ def collect_license_and_rule_references(codebase, include_packages=True, include
     Return a two-tuple of (``license_references``, ``license_rule_references``)
     sorted lists of unique mappings collected from a ``codebase``.
     """
+    if TRACE:
+        logger_debug(f'include_packages: {include_packages}, include_files: {include_files}')
 
     license_keys = set()
     rules_by_identifier = {}
 
     if include_packages:
         pks, prules = collect_references_from_packages(codebase)
-        license_keys.update(pks)
+        if TRACE:
+            logger_debug(f'collect_references_from_packages: license keys: {pks}')
+            logger_debug(f'collect_references_from_packages: rules by id: {prules}')
         rules_by_identifier.update(prules)
 
     if include_files:
         pks, prules = collect_references_from_files(codebase)
+        if TRACE:
+            logger_debug(f'collect_references_from_files: license keys: {pks}')
+            logger_debug(f'collect_references_from_files: rules by id: {prules}')
         license_keys.update(pks)
         rules_by_identifier.update(prules)
 
@@ -140,10 +147,6 @@ def collect_references_from_packages(codebase):
             if expression:
                 license_keys.update(licensing.license_keys(expression))
 
-        detections = getattr(resource, 'license_detections', []) or []
-        rules_by_id = build_rules_from_detection_data(detections)
-        rules_by_identifier.update(rules_by_id)
-
     for rule in rules_by_identifier.values():
         # TODO: consider using the expresion object directly instead
         expo = rule.license_expression
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index 5fddb50516d..df79830a879 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -30,6 +30,7 @@
 from commoncode.fileutils import file_base_name
 from commoncode.fileutils import file_name
 from commoncode.fileutils import resource_iter
+from commoncode.text import python_safe_name
 from licensedcode import MIN_MATCH_HIGH_LENGTH
 from licensedcode import MIN_MATCH_LENGTH
 from licensedcode import SMALL_RULE
@@ -2125,6 +2126,10 @@ def from_file(cls, rule_file, is_builtin=True):
         rule.load_data(rule_file=rule_file)
         return rule
 
+    @property
+    def pysafe_expression(self):
+        return python_safe_name(self.license_expression)
+
     def load_data(self, rule_file):
         """
         Load data from ``rule_file`` which has both the text and the data (as YAML forntmatter).
@@ -2581,7 +2586,7 @@ class SpdxRule(SynthethicRule):
     """
 
     def __attrs_post_init__(self, *args, **kwargs):
-        self.identifier = f'spdx-license-identifier-{self.license_expression}-{self._unique_id}'
+        self.identifier = f'spdx-license-identifier-{self.pysafe_expression}-{self._unique_id}'
         self.setup()
 
         if not self.license_expression:
@@ -2635,7 +2640,7 @@ class UnDetectedRule(SynthethicRule):
     """
 
     def __attrs_post_init__(self, *args, **kwargs):
-        self.identifier = f'package-manifest-{self.license_expression}-{self._unique_id}'
+        self.identifier = f'package-manifest-{self.pysafe_expression}-{self._unique_id}'
         expression = self.licensing.parse(self.license_expression)
         self.license_expression = expression.render()
         self.license_expression_object = expression
diff --git a/src/licensedcode/query.py b/src/licensedcode/query.py
index c0fc20d6339..a597be032e9 100644
--- a/src/licensedcode/query.py
+++ b/src/licensedcode/query.py
@@ -507,7 +507,7 @@ def tokens_by_line(
             if spdx_start_offset is not None:
                 # keep the line, start/end known pos for SPDX matching
                 spdx_prefix, spdx_expression = split_spdx_lid(line)
-                spdx_text = ' '.join([spdx_prefix or '', spdx_expression])
+                spdx_text = ''.join([spdx_prefix or '', spdx_expression])
                 spdx_start_known_pos = line_first_known_pos + spdx_start_offset
 
                 if spdx_start_known_pos <= line_last_known_pos:
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 f2e54028063..60105bffea7 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
@@ -55,12 +55,12 @@
               "matched_length": 5,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+              "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_url": null,
               "matched_text": "Artistic-2.0 OR MIT"
             }
           ],
-          "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370"
+          "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231"
         }
       ],
       "other_license_expression": null,
@@ -86,7 +86,7 @@
   "dependencies": [],
   "license_detections": [
     {
-      "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93",
+      "identifier": "apache_2_0_and__mit_or_bsd_simplified-8f8d79c6-d33c-addb-ff36-9f46bc8eb8a2",
       "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
       "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
@@ -119,7 +119,7 @@
           "matched_length": 8,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808",
+          "rule_identifier": "spdx-license-identifier-mit_or_bsd_simplified-521d0523ce32cc52dd709e9fc653552931947808",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause",
           "matched_text_diagnostics": "SPDX-License-Identifier: MIT or BSD-2-Clause"
@@ -152,7 +152,7 @@
       ]
     },
     {
-      "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370",
+      "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231",
       "license_expression": "artistic-2.0 OR mit",
       "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
@@ -169,7 +169,7 @@
           "matched_length": 5,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+          "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_url": null,
           "matched_text": "Artistic-2.0 OR MIT"
         }
@@ -417,7 +417,7 @@
     },
     {
       "license_expression": "artistic-2.0 OR mit",
-      "identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+      "identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
       "language": "en",
       "rule_url": null,
       "is_license_text": false,
@@ -444,7 +444,7 @@
     },
     {
       "license_expression": "mit OR bsd-simplified",
-      "identifier": "spdx-license-identifier-mit OR bsd-simplified-521d0523ce32cc52dd709e9fc653552931947808",
+      "identifier": "spdx-license-identifier-mit_or_bsd_simplified-521d0523ce32cc52dd709e9fc653552931947808",
       "language": "en",
       "rule_url": null,
       "is_license_text": false,
@@ -524,14 +524,14 @@
               "matched_length": 8,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
+              "rule_identifier": "spdx-license-identifier-mit_or_bsd_simplified-521d0523ce32cc52dd709e9fc653552931947808",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause",
               "matched_text_diagnostics": "SPDX-License-Identifier: MIT or BSD-2-Clause"
             }
           ],
           "detection_log": [],
-          "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93"
+          "identifier": "apache_2_0_and__mit_or_bsd_simplified-8f8d79c6-d33c-addb-ff36-9f46bc8eb8a2"
         }
       ],
       "license_clues": [],
@@ -597,12 +597,12 @@
                   "matched_length": 5,
                   "match_coverage": 100.0,
                   "rule_relevance": 100,
-                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+                  "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_url": null,
                   "matched_text": "Artistic-2.0 OR MIT"
                 }
               ],
-              "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370"
+              "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231"
             }
           ],
           "other_license_expression": null,
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 42cf8c1fd3b..5ec2ad67206 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
@@ -55,12 +55,12 @@
               "matched_length": 5,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+              "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
               "rule_url": null,
               "matched_text": "Artistic-2.0 OR MIT"
             }
           ],
-          "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370"
+          "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231"
         }
       ],
       "other_license_expression": null,
@@ -86,7 +86,7 @@
   "dependencies": [],
   "license_detections": [
     {
-      "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93",
+      "identifier": "apache_2_0_and__mit_or_bsd_simplified-8f8d79c6-d33c-addb-ff36-9f46bc8eb8a2",
       "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
       "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
@@ -116,7 +116,7 @@
           "matched_length": 8,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
+          "rule_identifier": "spdx-license-identifier-mit_or_bsd_simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
           "rule_url": null
         }
       ]
@@ -144,7 +144,7 @@
       ]
     },
     {
-      "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370",
+      "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231",
       "license_expression": "artistic-2.0 OR mit",
       "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
@@ -160,7 +160,7 @@
           "matched_length": 5,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+          "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
           "rule_url": null
         }
       ]
@@ -407,7 +407,7 @@
     },
     {
       "license_expression": "artistic-2.0 OR mit",
-      "identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+      "identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
       "language": "en",
       "rule_url": null,
       "is_license_text": false,
@@ -434,7 +434,7 @@
     },
     {
       "license_expression": "mit OR bsd-simplified",
-      "identifier": "spdx-license-identifier-mit OR bsd-simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
+      "identifier": "spdx-license-identifier-mit_or_bsd_simplified-c8fa3f8aa8e5819b052e913ac9dec497534a442b",
       "language": "en",
       "rule_url": null,
       "is_license_text": false,
@@ -512,11 +512,11 @@
               "matched_length": 8,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-f59ff8931aa67ccbfb194b8c7db7d4e5eafb709c",
+              "rule_identifier": "spdx-license-identifier-mit_or_bsd_simplified-521d0523ce32cc52dd709e9fc653552931947808",
               "rule_url": null
             }
           ],
-          "identifier": "apache_2_0_and__mit_or_bsd_simplified-a6ac74a7-7a5d-f78e-e6da-54ac6d836a93"
+          "identifier": "apache_2_0_and__mit_or_bsd_simplified-8f8d79c6-d33c-addb-ff36-9f46bc8eb8a2"
         }
       ],
       "license_clues": [],
@@ -582,12 +582,12 @@
                   "matched_length": 5,
                   "match_coverage": 100.0,
                   "rule_relevance": 100,
-                  "rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
+                  "rule_identifier": "spdx-license-identifier-artistic_2_0_or_mit-512604ee8f4c8e5ccdd4631c2b447196299cd404",
                   "rule_url": null,
                   "matched_text": "Artistic-2.0 OR MIT"
                 }
               ],
-              "identifier": "artistic_2_0_or_mit-529b866b-c702-0328-8f33-363ba46b3370"
+              "identifier": "artistic_2_0_or_mit-0549e3ec-193d-d46c-a851-893a86e6b231"
             }
           ],
           "other_license_expression": null,
diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json
index fc6bd3e7f7c..c7812b7f436 100644
--- a/tests/licensedcode/data/match_spdx/scan-expected.json
+++ b/tests/licensedcode/data/match_spdx/scan-expected.json
@@ -1,7 +1,7 @@
 {
   "license_detections": [
     {
-      "identifier": "mit-86af397f-7fb9-6751-2e09-217685ce5b2a",
+      "identifier": "mit-59928f02-ade3-817b-5db4-dfe1c6738ef4",
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
@@ -48,14 +48,14 @@
               "matched_length": 5,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-mit-6fcd9fa0c61347e06feb569ce3335c1b374640a1",
+              "rule_identifier": "spdx-license-identifier-mit-38fe0b852f1f8545c4a1b7ac0e456b182dbeb3ab",
               "rule_url": null,
               "matched_text": "MIT                ",
               "matched_text_diagnostics": "licenses.nuget.org/MIT\">MIT.",
+          "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
         }
       ]
     },
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
+      "detection_log": [],
       "sample_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
@@ -39,12 +43,252 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-258b785d25f606282f8c2f4ed6e51a66b60b7f16",
-          "rule_url": null
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_url": null,
+          "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+          "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
         }
       ]
     }
   ],
+  "license_references": [
+    {
+      "key": "apache-1.0",
+      "language": "en",
+      "short_name": "Apache 1.0",
+      "name": "Apache License 1.0",
+      "category": "Permissive",
+      "owner": "Apache Software Foundation",
+      "homepage_url": "http://www.apache.org/licenses/",
+      "notes": null,
+      "is_builtin": true,
+      "is_exception": false,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "Apache-1.0",
+      "other_spdx_license_keys": [],
+      "osi_license_key": null,
+      "text_urls": [
+        "http://www.apache.org/licenses/LICENSE-1.0"
+      ],
+      "osi_url": null,
+      "faq_url": "http://www.apache.org/foundation/licence-FAQ.html",
+      "other_urls": [],
+      "key_aliases": [],
+      "minimum_coverage": 80,
+      "standard_notice": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [
+        "the Apache Group"
+      ],
+      "ignorable_urls": [
+        "http://www.apache.org/"
+      ],
+      "ignorable_emails": [
+        "apache@apache.org"
+      ],
+      "text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer. \n\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in\n   the documentation and/or other materials provided with the\n   distribution.\n\n3. All advertising materials mentioning features or use of this\n   software must display the following acknowledgment:\n   \"This product includes software developed by the Apache Group\n   for use in the Apache HTTP server project (http://www.apache.org/).\"\n\n4. The names \"Apache Server\" and \"Apache Group\" must not be used to\n   endorse or promote products derived from this software without\n   prior written permission. For written permission, please contact\n   apache@apache.org.\n\n5. Products derived from this software may not be called \"Apache\"\n   nor may \"Apache\" appear in their names without prior written\n   permission of the Apache Group.\n\n6. Redistributions of any form whatsoever must retain the following\n   acknowledgment:\n   \"This product includes software developed by the Apache Group\n   for use in the Apache HTTP server project (http://www.apache.org/).\"\n\nTHIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\nEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\nITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\nNOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\nSTRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\nOF THE POSSIBILITY OF SUCH DAMAGE.\n====================================================================\n\nThis software consists of voluntary contributions made by many\nindividuals on behalf of the Apache Group and was originally based\non public domain software written at the National Center for\nSupercomputing Applications, University of Illinois, Urbana-Champaign.\nFor more information on the Apache Group and the Apache HTTP server\nproject, please see .",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/apache-1.0",
+      "spdx_url": "https://spdx.org/licenses/Apache-1.0"
+    },
+    {
+      "key": "gpl-2.0",
+      "language": "en",
+      "short_name": "GPL 2.0",
+      "name": "GNU General Public License 2.0",
+      "category": "Copyleft",
+      "owner": "Free Software Foundation (FSF)",
+      "homepage_url": "http://www.gnu.org/licenses/gpl-2.0.html",
+      "notes": "This is the last version of the GPL text as published by the FSF. This variation was published around about the time of the FSF released the GPL 3 in July 2007. See http://web.archive.org/web/20070716031727/http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt It is found live here https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt and here https://www.gnu.org/licenses/old-licenses/gpl-2.0.html It refers to the Franklin Street address and to the GNU Lesser General Public License everywhere both in the text and HTML formats. There are many other variations of the GPL 2.0 text that were published over the years by the FSF and the gnu.org website. You can find the detailed history of this text at https://github.com/pombredanne/gpl-history and each variant is available as a license detection rule. Per SPDX.org, this license was released June 1991 This license is OSI certified.",
+      "is_builtin": true,
+      "is_exception": false,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "GPL-2.0-only",
+      "other_spdx_license_keys": [
+        "GPL-2.0",
+        "GPL 2.0",
+        "LicenseRef-GPL-2.0"
+      ],
+      "osi_license_key": "GPL-2.0",
+      "text_urls": [
+        "http://www.gnu.org/licenses/gpl-2.0.txt",
+        "http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"
+      ],
+      "osi_url": "http://opensource.org/licenses/gpl-license.php",
+      "faq_url": "http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html",
+      "other_urls": [
+        "http://creativecommons.org/choose/cc-gpl",
+        "http://creativecommons.org/images/public/cc-GPL-a.png",
+        "http://creativecommons.org/licenses/GPL/2.0/",
+        "http://creativecommons.org/licenses/GPL/2.0/legalcode.pt",
+        "http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html",
+        "http://www.opensource.org/licenses/GPL-2.0",
+        "https://opensource.org/licenses/GPL-2.0",
+        "https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html"
+      ],
+      "key_aliases": [],
+      "minimum_coverage": 0,
+      "standard_notice": null,
+      "ignorable_copyrights": [
+        "Copyright (c) 1989, 1991 Free Software Foundation, Inc.",
+        "copyrighted by the Free Software Foundation"
+      ],
+      "ignorable_holders": [
+        "Free Software Foundation, Inc.",
+        "the Free Software Foundation"
+      ],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 2, June 1991\n \n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n \n                            Preamble\n \n  The licenses for most software are designed to take away your\nfreedom to share and change it.  By contrast, the GNU General Public\nLicense is intended to guarantee your freedom to share and change free\nsoftware--to make sure the software is free for all its users.  This\nGeneral Public License applies to most of the Free Software\nFoundation's software and to any other program whose authors commit to\nusing it.  (Some other Free Software Foundation software is covered by\nthe GNU Lesser General Public License instead.)  You can apply it to\nyour programs, too.\n \n  When we speak of free software, we are referring to freedom, not\nprice.  Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthis service if you wish), that you receive source code or can get it\nif you want it, that you can change the software or use pieces of it\nin new free programs; and that you know you can do these things.\n \n  To protect your rights, we need to make restrictions that forbid\nanyone to deny you these rights or to ask you to surrender the rights.\nThese restrictions translate to certain responsibilities for you if you\ndistribute copies of the software, or if you modify it.\n \n  For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must give the recipients all the rights that\nyou have.  You must make sure that they, too, receive or can get the\nsource code.  And you must show them these terms so they know their\nrights.\n \n  We protect your rights with two steps: (1) copyright the software, and\n(2) offer you this license which gives you legal permission to copy,\ndistribute and/or modify the software.\n \n  Also, for each author's protection and ours, we want to make certain\nthat everyone understands that there is no warranty for this free\nsoftware.  If the software is modified by someone else and passed on, we\nwant its recipients to know that what they have is not the original, so\nthat any problems introduced by others will not reflect on the original\nauthors' reputations.\n \n  Finally, any free program is threatened constantly by software\npatents.  We wish to avoid the danger that redistributors of a free\nprogram will individually obtain patent licenses, in effect making the\nprogram proprietary.  To prevent this, we have made it clear that any\npatent must be licensed for everyone's free use or not licensed at all.\n \n  The precise terms and conditions for copying, distribution and\nmodification follow.\n \n                    GNU GENERAL PUBLIC LICENSE\n   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n \n  0. This License applies to any program or other work which contains\na notice placed by the copyright holder saying it may be distributed\nunder the terms of this General Public License.  The \"Program\", below,\nrefers to any such program or work, and a \"work based on the Program\"\nmeans either the Program or any derivative work under copyright law:\nthat is to say, a work containing the Program or a portion of it,\neither verbatim or with modifications and/or translated into another\nlanguage.  (Hereinafter, translation is included without limitation in\nthe term \"modification\".)  Each licensee is addressed as \"you\".\n \nActivities other than copying, distribution and modification are not\ncovered by this License; they are outside its scope.  The act of\nrunning the Program is not restricted, and the output from the Program\nis covered only if its contents constitute a work based on the\nProgram (independent of having been made by running the Program).\nWhether that is true depends on what the Program does.\n \n  1. You may copy and distribute verbatim copies of the Program's\nsource code as you receive it, in any medium, provided that you\nconspicuously and appropriately publish on each copy an appropriate\ncopyright notice and disclaimer of warranty; keep intact all the\nnotices that refer to this License and to the absence of any warranty;\nand give any other recipients of the Program a copy of this License\nalong with the Program.\n \nYou may charge a fee for the physical act of transferring a copy, and\nyou may at your option offer warranty protection in exchange for a fee.\n \n  2. You may modify your copy or copies of the Program or any portion\nof it, thus forming a work based on the Program, and copy and\ndistribute such modifications or work under the terms of Section 1\nabove, provided that you also meet all of these conditions:\n \n    a) You must cause the modified files to carry prominent notices\n    stating that you changed the files and the date of any change.\n \n    b) You must cause any work that you distribute or publish, that in\n    whole or in part contains or is derived from the Program or any\n    part thereof, to be licensed as a whole at no charge to all third\n    parties under the terms of this License.\n \n    c) If the modified program normally reads commands interactively\n    when run, you must cause it, when started running for such\n    interactive use in the most ordinary way, to print or display an\n    announcement including an appropriate copyright notice and a\n    notice that there is no warranty (or else, saying that you provide\n    a warranty) and that users may redistribute the program under\n    these conditions, and telling the user how to view a copy of this\n    License.  (Exception: if the Program itself is interactive but\n    does not normally print such an announcement, your work based on\n    the Program is not required to print an announcement.)\n \nThese requirements apply to the modified work as a whole.  If\nidentifiable sections of that work are not derived from the Program,\nand can be reasonably considered independent and separate works in\nthemselves, then this License, and its terms, do not apply to those\nsections when you distribute them as separate works.  But when you\ndistribute the same sections as part of a whole which is a work based\non the Program, the distribution of the whole must be on the terms of\nthis License, whose permissions for other licensees extend to the\nentire whole, and thus to each and every part regardless of who wrote it.\n \nThus, it is not the intent of this section to claim rights or contest\nyour rights to work written entirely by you; rather, the intent is to\nexercise the right to control the distribution of derivative or\ncollective works based on the Program.\n \nIn addition, mere aggregation of another work not based on the Program\nwith the Program (or with a work based on the Program) on a volume of\na storage or distribution medium does not bring the other work under\nthe scope of this License.\n \n  3. You may copy and distribute the Program (or a work based on it,\nunder Section 2) in object code or executable form under the terms of\nSections 1 and 2 above provided that you also do one of the following:\n \n    a) Accompany it with the complete corresponding machine-readable\n    source code, which must be distributed under the terms of Sections\n    1 and 2 above on a medium customarily used for software interchange; or,\n \n    b) Accompany it with a written offer, valid for at least three\n    years, to give any third party, for a charge no more than your\n    cost of physically performing source distribution, a complete\n    machine-readable copy of the corresponding source code, to be\n    distributed under the terms of Sections 1 and 2 above on a medium\n    customarily used for software interchange; or,\n \n    c) Accompany it with the information you received as to the offer\n    to distribute corresponding source code.  (This alternative is\n    allowed only for noncommercial distribution and only if you\n    received the program in object code or executable form with such\n    an offer, in accord with Subsection b above.)\n \nThe source code for a work means the preferred form of the work for\nmaking modifications to it.  For an executable work, complete source\ncode means all the source code for all modules it contains, plus any\nassociated interface definition files, plus the scripts used to\ncontrol compilation and installation of the executable.  However, as a\nspecial exception, the source code distributed need not include\nanything that is normally distributed (in either source or binary\nform) with the major components (compiler, kernel, and so on) of the\noperating system on which the executable runs, unless that component\nitself accompanies the executable.\n \nIf distribution of executable or object code is made by offering\naccess to copy from a designated place, then offering equivalent\naccess to copy the source code from the same place counts as\ndistribution of the source code, even though third parties are not\ncompelled to copy the source along with the object code.\n \n  4. You may not copy, modify, sublicense, or distribute the Program\nexcept as expressly provided under this License.  Any attempt\notherwise to copy, modify, sublicense or distribute the Program is\nvoid, and will automatically terminate your rights under this License.\nHowever, parties who have received copies, or rights, from you under\nthis License will not have their licenses terminated so long as such\nparties remain in full compliance.\n \n  5. You are not required to accept this License, since you have not\nsigned it.  However, nothing else grants you permission to modify or\ndistribute the Program or its derivative works.  These actions are\nprohibited by law if you do not accept this License.  Therefore, by\nmodifying or distributing the Program (or any work based on the\nProgram), you indicate your acceptance of this License to do so, and\nall its terms and conditions for copying, distributing or modifying\nthe Program or works based on it.\n \n  6. Each time you redistribute the Program (or any work based on the\nProgram), the recipient automatically receives a license from the\noriginal licensor to copy, distribute or modify the Program subject to\nthese terms and conditions.  You may not impose any further\nrestrictions on the recipients' exercise of the rights granted herein.\nYou are not responsible for enforcing compliance by third parties to\nthis License.\n \n  7. If, as a consequence of a court judgment or allegation of patent\ninfringement or for any other reason (not limited to patent issues),\nconditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License.  If you cannot\ndistribute so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you\nmay not distribute the Program at all.  For example, if a patent\nlicense would not permit royalty-free redistribution of the Program by\nall those who receive copies directly or indirectly through you, then\nthe only way you could satisfy both it and this License would be to\nrefrain entirely from distribution of the Program.\n \nIf any portion of this section is held invalid or unenforceable under\nany particular circumstance, the balance of the section is intended to\napply and the section as a whole is intended to apply in other\ncircumstances.\n \nIt is not the purpose of this section to induce you to infringe any\npatents or other property right claims or to contest validity of any\nsuch claims; this section has the sole purpose of protecting the\nintegrity of the free software distribution system, which is\nimplemented by public license practices.  Many people have made\ngenerous contributions to the wide range of software distributed\nthrough that system in reliance on consistent application of that\nsystem; it is up to the author/donor to decide if he or she is willing\nto distribute software through any other system and a licensee cannot\nimpose that choice.\n \nThis section is intended to make thoroughly clear what is believed to\nbe a consequence of the rest of this License.\n \n  8. If the distribution and/or use of the Program is restricted in\ncertain countries either by patents or by copyrighted interfaces, the\noriginal copyright holder who places the Program under this License\nmay add an explicit geographical distribution limitation excluding\nthose countries, so that distribution is permitted only in or among\ncountries not thus excluded.  In such case, this License incorporates\nthe limitation as if written in the body of this License.\n \n  9. The Free Software Foundation may publish revised and/or new versions\nof the General Public License from time to time.  Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n \nEach version is given a distinguishing version number.  If the Program\nspecifies a version number of this License which applies to it and \"any\nlater version\", you have the option of following the terms and conditions\neither of that version or of any later version published by the Free\nSoftware Foundation.  If the Program does not specify a version number of\nthis License, you may choose any version ever published by the Free Software\nFoundation.\n \n  10. If you wish to incorporate parts of the Program into other free\nprograms whose distribution conditions are different, write to the author\nto ask for permission.  For software which is copyrighted by the Free\nSoftware Foundation, write to the Free Software Foundation; we sometimes\nmake exceptions for this.  Our decision will be guided by the two goals\nof preserving the free status of all derivatives of our free software and\nof promoting the sharing and reuse of software generally.\n \n                            NO WARRANTY\n \n  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\nFOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\nOTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\nPROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\nOR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\nMERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\nTO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\nPROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\nREPAIR OR CORRECTION.\n \n  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\nREDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\nINCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\nOUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\nTO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\nYOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\nPROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\nPOSSIBILITY OF SUCH DAMAGES.\n \n                     END OF TERMS AND CONDITIONS\n \n            How to Apply These Terms to Your New Programs\n \n  If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n \n  To do so, attach the following notices to the program.  It is safest\nto attach them to the start of each source file to most effectively\nconvey the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n \n    \n    Copyright (C)   \n \n    This program is free software; you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation; either version 2 of the License, or\n    (at your option) any later version.\n \n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n \n    You should have received a copy of the GNU General Public License along\n    with this program; if not, write to the Free Software Foundation, Inc.,\n    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n \nAlso add information on how to contact you by electronic and paper mail.\n \nIf the program is interactive, make it output a short notice like this\nwhen it starts in an interactive mode:\n \n    Gnomovision version 69, Copyright (C) year name of author\n    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n    This is free software, and you are welcome to redistribute it\n    under certain conditions; type `show c' for details.\n \nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License.  Of course, the commands you use may\nbe called something other than `show w' and `show c'; they could even be\nmouse-clicks or menu items--whatever suits your program.\n \nYou should also get your employer (if you work as a programmer) or your\nschool, if any, to sign a \"copyright disclaimer\" for the program, if\nnecessary.  Here is a sample; alter the names:\n \n  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n \n  , 1 April 1989\n  Ty Coon, President of Vice\n \nThis General Public License does not permit incorporating your program into\nproprietary programs.  If your program is a subroutine library, you may\nconsider it more useful to permit linking proprietary applications with the\nlibrary.  If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License.",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gpl-2.0.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/gpl-2.0",
+      "spdx_url": "https://spdx.org/licenses/GPL-2.0-only"
+    },
+    {
+      "key": "linux-openib",
+      "language": "en",
+      "short_name": "Linux-OpenIB",
+      "name": "Linux-OpenIB",
+      "category": "Permissive",
+      "owner": "Linux Foundation",
+      "homepage_url": "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/infiniband/core/sa.h",
+      "notes": "This license is a hybrid of two common licenses the BSD-2-Clause (bsd-\nsimplified) and the MIT License (mit).\n",
+      "is_builtin": true,
+      "is_exception": false,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "Linux-OpenIB",
+      "other_spdx_license_keys": [],
+      "osi_license_key": null,
+      "text_urls": [
+        "https://github.com/ofiwg/libfabric/blob/master/contrib/buildrpm/README"
+      ],
+      "osi_url": null,
+      "faq_url": null,
+      "other_urls": [
+        "https://github.com/spdx/license-list-XML/issues/620",
+        "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/infiniband/core/sa.h?id=3215b9d57a2c75c4305a3956ca303d7004485200"
+      ],
+      "key_aliases": [],
+      "minimum_coverage": 0,
+      "standard_notice": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "Redistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n- Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n- Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-openib.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/linux-openib",
+      "spdx_url": "https://spdx.org/licenses/Linux-OpenIB"
+    },
+    {
+      "key": "linux-syscall-exception-gpl",
+      "language": "en",
+      "short_name": "Linux Syscall Exception to GPL",
+      "name": "Linux Syscall Exception to GPL",
+      "category": "Copyleft Limited",
+      "owner": "Linux Foundation",
+      "homepage_url": null,
+      "notes": null,
+      "is_builtin": true,
+      "is_exception": true,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "Linux-syscall-note",
+      "other_spdx_license_keys": [],
+      "osi_license_key": null,
+      "text_urls": [],
+      "osi_url": null,
+      "faq_url": null,
+      "other_urls": [
+        "http://www.gnu.org/licenses/gpl-2.0.txt",
+        "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/COPYING"
+      ],
+      "key_aliases": [],
+      "minimum_coverage": 0,
+      "standard_notice": "NOTE! This copyright does *not* cover user programs that use kernel\nservices by normal system calls - this is merely considered normal use\nof the kernel, and does *not* fall under the heading of \"derived work\".\nAlso note that the GPL below is copyrighted by the Free Software\nFoundation, but the instance of code that it refers to (the Linux\nkernel) is copyrighted by me and others who actually wrote it.\nAlso note that the only valid version of the GPL as far as the kernel\nis concerned is _this_ particular version of the license (ie v2, not\nv2.2 or v3.x or whatever), unless explicitly otherwise stated.\nLinus Torvalds\nThis library is free software; you can redistribute it and/or modify it\nunder the terms of the GNU General Public License version 2 as published by\nthe Free Software Foundation.\nThis library is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\nFITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\nmore details.\nYou should have received a copy of the GNU General Public License along\nwith this library; see the file COPYING. If not, write to the Free Software\nFoundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n",
+      "ignorable_copyrights": [
+        "copyrighted by the Free Software Foundation"
+      ],
+      "ignorable_holders": [
+        "the Free Software Foundation"
+      ],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "NOTE! This copyright does *not* cover user programs that use kernel\nservices by normal system calls - this is merely considered normal use\nof the kernel, and does *not* fall under the heading of \"derived work\".\nAlso note that the GPL below is copyrighted by the Free Software\nFoundation, but the instance of code that it refers to (the Linux\nkernel) is copyrighted by me and others who actually wrote it.\n\nAlso note that the only valid version of the GPL as far as the kernel\nis concerned is _this_ particular version of the license (ie v2, not\nv2.2 or v3.x or whatever), unless explicitly otherwise stated.\n\nLinus Torvalds",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/linux-syscall-exception-gpl.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/linux-syscall-exception-gpl",
+      "spdx_url": "https://spdx.org/licenses/Linux-syscall-note"
+    }
+  ],
+  "license_rule_references": [
+    {
+      "license_expression": "apache-1.0",
+      "identifier": "apache-1.0.LICENSE",
+      "language": "en",
+      "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
+      "is_license_text": true,
+      "is_license_notice": false,
+      "is_license_reference": false,
+      "is_license_tag": false,
+      "is_license_intro": false,
+      "is_license_clue": false,
+      "is_continuous": false,
+      "is_builtin": true,
+      "is_from_license": true,
+      "is_synthetic": false,
+      "length": 368,
+      "relevance": 100,
+      "minimum_coverage": 80,
+      "referenced_filenames": [],
+      "notes": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [
+        "the Apache Group"
+      ],
+      "ignorable_urls": [
+        "http://www.apache.org/"
+      ],
+      "ignorable_emails": [
+        "apache@apache.org"
+      ],
+      "text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n\n1. Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright\nnotice, this list of conditions and the following disclaimer in\nthe documentation and/or other materials provided with the\ndistribution.\n\n3. All advertising materials mentioning features or use of this\nsoftware must display the following acknowledgment:\n\"This product includes software developed by the Apache Group\nfor use in the Apache HTTP server project (http://www.apache.org/).\"\n\n4. The names \"Apache Server\" and \"Apache Group\" must not be used to\nendorse or promote products derived from this software without\nprior written permission. For written permission, please contact\napache@apache.org.\n\n5. Products derived from this software may not be called \"Apache\"\nnor may \"Apache\" appear in their names without prior written\npermission of the Apache Group.\n\n6. Redistributions of any form whatsoever must retain the following\nacknowledgment:\n\"This product includes software developed by the Apache Group\nfor use in the Apache HTTP server project (http://www.apache.org/).\"\n\nTHIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\nEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\nITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\nNOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\nSTRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\nOF THE POSSIBILITY OF SUCH DAMAGE.\n====================================================================\n\nThis software consists of voluntary contributions made by many\nindividuals on behalf of the Apache Group and was originally based\non public domain software written at the National Center for\nSupercomputing Applications, University of Illinois, Urbana-Champaign.\nFor more information on the Apache Group and the Apache HTTP server\nproject, please see ."
+    },
+    {
+      "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
+      "identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+      "language": "en",
+      "rule_url": null,
+      "is_license_text": false,
+      "is_license_notice": false,
+      "is_license_reference": false,
+      "is_license_tag": true,
+      "is_license_intro": false,
+      "is_license_clue": false,
+      "is_continuous": false,
+      "is_builtin": true,
+      "is_from_license": false,
+      "is_synthetic": true,
+      "length": 13,
+      "relevance": 100,
+      "minimum_coverage": 0,
+      "referenced_filenames": [],
+      "notes": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
+    }
+  ],
   "files": [
     {
       "path": "apache-1.0.txt",
@@ -68,9 +312,12 @@
               "match_coverage": 100.0,
               "rule_relevance": 100,
               "rule_identifier": "apache-1.0.LICENSE",
-              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE"
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-1.0.LICENSE",
+              "matched_text": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see .",
+              "matched_text_diagnostics": "Redistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions\r\nare met:\r\n\r\n 1. Redistributions of source code must retain the above copyright\r\n    notice, this list of conditions and the following disclaimer. \r\n \r\n 2. Redistributions in binary form must reproduce the above copyright\r\n    notice, this list of conditions and the following disclaimer in\r\n    the documentation and/or other materials provided with the\r\n    distribution.\r\n \r\n 3. All advertising materials mentioning features or use of this\r\n    software must display the following acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n 4. The names \"Apache Server\" and \"Apache Group\" must not be used to\r\n    endorse or promote products derived from this software without\r\n    prior written permission. For written permission, please contact\r\n    apache@apache.org.\r\n \r\n 5. Products derived from this software may not be called \"Apache\"\r\n    nor may \"Apache\" appear in their names without prior written\r\n    permission of the Apache Group.\r\n \r\n 6. Redistributions of any form whatsoever must retain the following\r\n    acknowledgment:\r\n    \"This product includes software developed by the Apache Group\r\n    for use in the Apache HTTP server project (http://www.apache.org/).\"\r\n \r\n THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY\r\n EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r\n PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR\r\n ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r\n SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\r\n NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r\n LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r\n HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r\n STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\n ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\r\n OF THE POSSIBILITY OF SUCH DAMAGE.\r\n====================================================================\r\n\r\n This software consists of voluntary contributions made by many\r\n individuals on behalf of the Apache Group and was originally based\r\n on public domain software written at the National Center for\r\n Supercomputing Applications, University of Illinois, Urbana-Champaign.\r\n For more information on the Apache Group and the Apache HTTP server\r\n project, please see ."
             }
           ],
+          "detection_log": [],
           "identifier": "apache_1_0-01e67edb-9930-c1d2-2a95-f923a0ecacfb"
         }
       ],
@@ -99,11 +346,14 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
-              "rule_url": null
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+              "rule_url": null,
+              "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
+              "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "detection_log": [],
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
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 df933a6996c..b8fd638cc7b 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
@@ -1,7 +1,7 @@
 {
   "license_detections": [
     {
-      "identifier": "zlib_and_apache_2_0-98210dcd-8eb2-6675-dd67-08f007face08",
+      "identifier": "zlib_and_apache_2_0-d2dd5765-db15-d485-52b5-2b87410a725a",
       "license_expression": "zlib AND apache-2.0",
       "license_expression_spdx": "Zlib AND Apache-2.0",
       "detection_count": 1,
@@ -34,7 +34,7 @@
           "matched_length": 6,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-apache-2.0-5dcda840588b4f07f49f2c0100924ebca7bc0649",
+          "rule_identifier": "spdx-license-identifier-apache_2_0-5dcda840588b4f07f49f2c0100924ebca7bc0649",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: Apache-2.0",
           "matched_text_diagnostics": "SPDX-License-Identifier: Apache-2.0"
@@ -42,6 +42,148 @@
       ]
     }
   ],
+  "license_references": [
+    {
+      "key": "apache-2.0",
+      "language": "en",
+      "short_name": "Apache 2.0",
+      "name": "Apache License 2.0",
+      "category": "Permissive",
+      "owner": "Apache Software Foundation",
+      "homepage_url": "http://www.apache.org/licenses/",
+      "notes": "Per SPDX.org, this version was released January 2004 This license is OSI\ncertified\n",
+      "is_builtin": true,
+      "is_exception": false,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "Apache-2.0",
+      "other_spdx_license_keys": [
+        "LicenseRef-Apache",
+        "LicenseRef-Apache-2.0"
+      ],
+      "osi_license_key": "Apache-2.0",
+      "text_urls": [
+        "http://www.apache.org/licenses/LICENSE-2.0"
+      ],
+      "osi_url": "http://opensource.org/licenses/apache2.0.php",
+      "faq_url": "http://www.apache.org/foundation/licence-FAQ.html",
+      "other_urls": [
+        "http://www.opensource.org/licenses/Apache-2.0",
+        "https://opensource.org/licenses/Apache-2.0",
+        "https://www.apache.org/licenses/LICENSE-2.0"
+      ],
+      "key_aliases": [],
+      "minimum_coverage": 0,
+      "standard_notice": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [
+        "http://www.apache.org/licenses/",
+        "http://www.apache.org/licenses/LICENSE-2.0"
+      ],
+      "ignorable_emails": [],
+      "text": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n \n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n \n   1. Definitions.\n \n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n \n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n \n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n \n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n \n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n \n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n \n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n \n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n \n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n \n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n \n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n \n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n \n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n \n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n \n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n \n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n \n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n \n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n \n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n \n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n \n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n \n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n \n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n \n   END OF TERMS AND CONDITIONS\n \n   APPENDIX: How to apply the Apache License to your work.\n \n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n \n   Copyright [yyyy] [name of copyright owner]\n \n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n \n       http://www.apache.org/licenses/LICENSE-2.0\n \n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/apache-2.0.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/apache-2.0",
+      "spdx_url": "https://spdx.org/licenses/Apache-2.0"
+    },
+    {
+      "key": "zlib",
+      "language": "en",
+      "short_name": "ZLIB License",
+      "name": "ZLIB License",
+      "category": "Permissive",
+      "owner": "zlib",
+      "homepage_url": "http://www.zlib.net/",
+      "notes": "Per SPDX.org, this is OSI certified",
+      "is_builtin": true,
+      "is_exception": false,
+      "is_unknown": false,
+      "is_generic": false,
+      "spdx_license_key": "Zlib",
+      "other_spdx_license_keys": [],
+      "osi_license_key": null,
+      "text_urls": [
+        "http://www.gzip.org/zlib/zlib_license.html"
+      ],
+      "osi_url": "http://www.opensource.org/licenses/zlib-license.php",
+      "faq_url": "http://www.gzip.org/zlib/zlib-faq.html",
+      "other_urls": [
+        "http://www.opensource.org/licenses/Zlib",
+        "http://www.zlib.net/zlib_license.html",
+        "https://opensource.org/licenses/Zlib"
+      ],
+      "key_aliases": [],
+      "minimum_coverage": 50,
+      "standard_notice": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "This software is provided 'as-is', without any express or implied warranty. In no\nevent will the authors be held liable for any damages arising from the use of this\nsoftware.\n\nPermission is granted to anyone to use this software for any purpose, including\ncommercial applications, and to alter it and redistribute it freely, subject to\nthe following restrictions:\n\n1. The origin of this software must not be misrepresented; you must not claim that\n   you wrote the original software. If you use this software in a product, an\n   acknowledgment in the product documentation would be appreciated but is not\n   required.\n\n2. Altered source versions must be plainly marked as such, and must not be\n   misrepresented as being the original software.\n\n3. This notice may not be removed or altered from any source distribution.",
+      "scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/zlib.LICENSE",
+      "licensedb_url": "https://scancode-licensedb.aboutcode.org/zlib",
+      "spdx_url": "https://spdx.org/licenses/Zlib"
+    }
+  ],
+  "license_rule_references": [
+    {
+      "license_expression": "apache-2.0",
+      "identifier": "spdx-license-identifier-apache_2_0-5dcda840588b4f07f49f2c0100924ebca7bc0649",
+      "language": "en",
+      "rule_url": null,
+      "is_license_text": false,
+      "is_license_notice": false,
+      "is_license_reference": false,
+      "is_license_tag": true,
+      "is_license_intro": false,
+      "is_license_clue": false,
+      "is_continuous": false,
+      "is_builtin": true,
+      "is_from_license": false,
+      "is_synthetic": true,
+      "length": 6,
+      "relevance": 100,
+      "minimum_coverage": 0,
+      "referenced_filenames": [],
+      "notes": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "SPDX-License-Identifier: Apache-2.0"
+    },
+    {
+      "license_expression": "zlib",
+      "identifier": "spdx-license-identifier-zlib-4a028b82b49264191c29aec7d2e5b4d780173fab",
+      "language": "en",
+      "rule_url": null,
+      "is_license_text": false,
+      "is_license_notice": false,
+      "is_license_reference": false,
+      "is_license_tag": true,
+      "is_license_intro": false,
+      "is_license_clue": false,
+      "is_continuous": false,
+      "is_builtin": true,
+      "is_from_license": false,
+      "is_synthetic": true,
+      "length": 4,
+      "relevance": 100,
+      "minimum_coverage": 0,
+      "referenced_filenames": [],
+      "notes": null,
+      "ignorable_copyrights": [],
+      "ignorable_holders": [],
+      "ignorable_authors": [],
+      "ignorable_urls": [],
+      "ignorable_emails": [],
+      "text": "https://licenses.nuget.org/Zlib"
+    }
+  ],
   "files": [
     {
       "path": "spdx-expressions.txt",
@@ -64,7 +206,7 @@
               "matched_length": 4,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-zlib-defbb051fec96d25d21a92bf9e28889f674a89dc",
+              "rule_identifier": "spdx-license-identifier-zlib-478bffd97a87207ab3ba955132d7a51b329faca0",
               "rule_url": null,
               "matched_text": "https://licenses.nuget.org/Zlib",
               "matched_text_diagnostics": "licenses.nuget.org/Zlib"
@@ -80,14 +222,14 @@
               "matched_length": 6,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-apache-2.0-8b7d7ba520c6ab392deaea36b8b1f018b637027e",
+              "rule_identifier": "spdx-license-identifier-apache_2_0-5dcda840588b4f07f49f2c0100924ebca7bc0649",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: Apache-2.0",
               "matched_text_diagnostics": "SPDX-License-Identifier: Apache-2.0"
             }
           ],
           "detection_log": [],
-          "identifier": "zlib_and_apache_2_0-98210dcd-8eb2-6675-dd67-08f007face08"
+          "identifier": "zlib_and_apache_2_0-d2dd5765-db15-d485-52b5-2b87410a725a"
         }
       ],
       "license_clues": [],
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 b99cd3ad3fa..8b48d43f712 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
@@ -4,66 +4,66 @@
     "license_expression_spdx": "EPL-2.0",
     "matches": [
       {
-        "score": 100.0,
+        "license_expression": "unknown-license-reference",
+        "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+        "from_file": null,
         "start_line": 4,
         "end_line": 5,
-        "from_file": null,
+        "matcher": "2-aho",
+        "score": 100.0,
         "matched_length": 14,
         "match_coverage": 100.0,
-        "matcher": "2-aho",
-        "license_expression": "unknown-license-reference",
-        "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-        "rule_identifier": "license-intro_29.RULE",
         "rule_relevance": 100,
+        "rule_identifier": "license-intro_29.RULE",
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/license-intro_29.RULE",
         "matched_text": " * This program and the accompanying materials are made\n * available under the terms of the Eclipse Public License 2.0"
       },
       {
-        "score": 100.0,
+        "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
+        "from_file": null,
         "start_line": 5,
         "end_line": 5,
-        "from_file": null,
+        "matcher": "2-aho",
+        "score": 100.0,
         "matched_length": 5,
         "match_coverage": 100.0,
-        "matcher": "2-aho",
-        "license_expression": "epl-2.0",
-        "spdx_license_expression": "EPL-2.0",
-        "rule_identifier": "epl-2.0_30.RULE",
         "rule_relevance": 100,
+        "rule_identifier": "epl-2.0_30.RULE",
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_30.RULE",
         "matched_text": " * available under the terms of the Eclipse Public License 2.0"
       },
       {
-        "score": 100.0,
+        "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
+        "from_file": null,
         "start_line": 6,
         "end_line": 6,
-        "from_file": null,
+        "matcher": "2-aho",
+        "score": 100.0,
         "matched_length": 8,
         "match_coverage": 100.0,
-        "matcher": "2-aho",
-        "license_expression": "epl-2.0",
-        "spdx_license_expression": "EPL-2.0",
-        "rule_identifier": "epl-2.0_2.RULE",
         "rule_relevance": 100,
+        "rule_identifier": "epl-2.0_2.RULE",
         "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-2.0_2.RULE",
         "matched_text": " * which is available at https://www.eclipse.org/legal/epl-2.0/"
       },
       {
-        "score": 100.0,
+        "license_expression": "epl-2.0",
+        "spdx_license_expression": "EPL-2.0",
+        "from_file": null,
         "start_line": 8,
         "end_line": 8,
-        "from_file": null,
+        "matcher": "1-spdx-id",
+        "score": 100.0,
         "matched_length": 5,
         "match_coverage": 100.0,
-        "matcher": "1-spdx-id",
-        "license_expression": "epl-2.0",
-        "spdx_license_expression": "EPL-2.0",
-        "rule_identifier": "spdx-license-identifier-epl-2.0-c05120fcba71854ec1ea0d2897a5dcb1290a6dea",
         "rule_relevance": 100,
+        "rule_identifier": "spdx-license-identifier-epl_2_0-fc3580adf1834d6862422242a06d59e74eb62582",
         "rule_url": null,
         "matched_text": " * SPDX-License-Identifier: EPL-2.0"
       }
     ],
-    "identifier": "epl_2_0-84903be0-4504-63f8-98ab-d918ff2fb53c"
+    "identifier": "epl_2_0-16e050c0-576a-1003-b3c3-e5b5354b0fc2"
   }
 ]
\ No newline at end of file
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 5321348aecd..2f7a47566e2 100644
--- a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
@@ -43,7 +43,7 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
           "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
@@ -73,14 +73,14 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
               "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
diff --git a/tests/licensedcode/data/plugin_license/text/scan.expected.json b/tests/licensedcode/data/plugin_license/text/scan.expected.json
index 31e4959cbc4..6e04e62d5e0 100644
--- a/tests/licensedcode/data/plugin_license/text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan.expected.json
@@ -25,7 +25,7 @@
       ]
     },
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
@@ -42,7 +42,7 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
         }
@@ -71,13 +71,13 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
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 345efce5853..f55ea1fb613 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
@@ -1,7 +1,7 @@
 {
   "license_detections": [
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
@@ -18,7 +18,7 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
           "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
@@ -73,14 +73,14 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
               "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
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 345efce5853..f55ea1fb613 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
@@ -1,7 +1,7 @@
 {
   "license_detections": [
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
@@ -18,7 +18,7 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
           "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
@@ -73,14 +73,14 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
               "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
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 2403ab6a1dc..eeadbee755b 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
@@ -1,7 +1,7 @@
 {
   "license_detections": [
     {
-      "identifier": "epl_2_0-c1e39224-7271-293c-64f7-090bd2f15988",
+      "identifier": "epl_2_0-1f628a4b-0e45-b83e-b594-35a20adb6ae0",
       "license_expression": "epl-2.0",
       "license_expression_spdx": "EPL-2.0",
       "detection_count": 1,
@@ -34,7 +34,7 @@
           "matched_length": 6,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-epl-2.0-0718e69b8b1cac97c407a917de96eec58fa0dada",
+          "rule_identifier": "spdx-license-identifier-epl_2_0-0718e69b8b1cac97c407a917de96eec58fa0dada",
           "rule_url": null,
           "matched_text": " * SPDX-License-Identifier: EPL-2.0",
           "matched_text_diagnostics": "SPDX-License-Identifier: EPL-2.0"
@@ -80,14 +80,14 @@
               "matched_length": 6,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-epl-2.0-c05120fcba71854ec1ea0d2897a5dcb1290a6dea",
+              "rule_identifier": "spdx-license-identifier-epl_2_0-fc3580adf1834d6862422242a06d59e74eb62582",
               "rule_url": null,
               "matched_text": " * SPDX-License-Identifier: EPL-2.0",
               "matched_text_diagnostics": "SPDX-License-Identifier: EPL-2.0"
             }
           ],
           "detection_log": [],
-          "identifier": "epl_2_0-c1e39224-7271-293c-64f7-090bd2f15988"
+          "identifier": "epl_2_0-1f628a4b-0e45-b83e-b594-35a20adb6ae0"
         }
       ],
       "license_clues": [],
diff --git a/tests/licensedcode/data/plugin_license_text/scan.expected.json b/tests/licensedcode/data/plugin_license_text/scan.expected.json
index 3776a3d8fad..8dec8645cc8 100644
--- a/tests/licensedcode/data/plugin_license_text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license_text/scan.expected.json
@@ -51,7 +51,7 @@
       ]
     },
     {
-      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0",
+      "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303",
       "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
@@ -68,7 +68,7 @@
           "matched_length": 13,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-40ad9110ec6551e97f55cd72b297773235a415e7",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
           "rule_url": null,
           "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
           "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
@@ -354,14 +354,14 @@
               "matched_length": 13,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib-4099cddf665e1c4068ae21bd191fabfb71b7c536",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-40ad9110ec6551e97f55cd72b297773235a415e7",
               "rule_url": null,
               "matched_text": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */",
               "matched_text_diagnostics": "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-Openib) */"
             }
           ],
           "detection_log": [],
-          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-c196bf1c-1c1f-18b4-554f-690be18bbad0"
+          "identifier": "gpl_2_0_with_linux_syscall_exception_gpl_or_linux_openib-e59dcea3-b71b-02e5-24d9-3795864d0303"
         }
       ],
       "license_clues": [],
diff --git a/tests/licensedcode/data/spdx/lines/basic.txt.json b/tests/licensedcode/data/spdx/lines/basic.txt.json
index 40cc921e1ef..ac68f78ae5f 100644
--- a/tests/licensedcode/data/spdx/lines/basic.txt.json
+++ b/tests/licensedcode/data/spdx/lines/basic.txt.json
@@ -1,246 +1,246 @@
 [
   [
-    "SPDX-License-Identifier:  (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
+    "SPDX-License-Identifier: (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
     0,
     15
   ],
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     16,
     42
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     44,
     49
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     50,
     55
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     56,
     61
   ],
   [
-    "SPDX-License-Identifier:  GPL-1.0+",
+    "SPDX-License-Identifier: GPL-1.0+",
     62,
     67
   ],
   [
-    "SPDX-License-Identifier:  GPL-1.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */",
     68,
     77
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     78,
     83
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     84,
     89
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0",
+    "SPDX-License-Identifier:    GPL-2.0",
     90,
     95
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     96,
     101
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     102,
     107
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     108,
     113
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     114,
     119
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     120,
     125
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0 */",
+    "SPDX-License-Identifier: GPL-2.0 */",
     126,
     131
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ */",
+    "SPDX-License-Identifier: GPL-2.0+ */",
     132,
     137
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     138,
     143
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR BSD-2-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)",
     144,
     153
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)",
     154,
     163
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)",
     164,
     173
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)",
     174,
     183
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR MIT)",
+    "SPDX-License-Identifier: (GPL-2.0 OR MIT)",
     184,
     191
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR MIT)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR MIT)",
     192,
     199
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR MPL-1.1)",
+    "SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)",
     200,
     209
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0 WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */",
     210,
     219
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */",
     220,
     229
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */",
     230,
     241
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */",
     242,
     255
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */",
     256,
     269
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */",
     270,
     283
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */",
     284,
     295
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */",
     296,
     305
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+",
+    "SPDX-License-Identifier: LGPL-2.1+",
     306,
     311
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1 WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */",
     312,
     321
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */",
     322,
     331
   ],
   [
-    "SPDX License Identifier  LGPL-2.1+",
+    "SPDX License Identifier LGPL-2.1+",
     332,
     337
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     347,
     352
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     353,
     358
   ],
   [
-    "SPDX-License-Identifier:         GPL-2.0+",
+    "SPDX-License-Identifier:        GPL-2.0+",
     359,
     364
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+ BSD-2-Clause",
+    "SPDX-License-Identifier:     GPL-2.0+ BSD-2-Clause",
     365,
     373
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+        BSD-2-Clause",
+    "SPDX-License-Identifier:     GPL-2.0+        BSD-2-Clause",
     374,
     382
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0    BSD-3-Clause",
+    "SPDX-License-Identifier: GPL-2.0    BSD-3-Clause",
     383,
     391
   ],
   [
-    "SPDX-License-Identifier:         GPL-2.0+        BSD-3-Clause",
+    "SPDX-License-Identifier:        GPL-2.0+        BSD-3-Clause",
     392,
     400
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0 IBM-pibs",
+    "SPDX-License-Identifier:     GPL-2.0 IBM-pibs",
     401,
     408
   ],
   [
-    "SPDX-License-Identifier:       ISC",
+    "SPDX-License-Identifier:      ISC",
     409,
     412
   ],
   [
-    "SPDX-License-Identifier:      LGPL-2.0+",
+    "SPDX-License-Identifier:     LGPL-2.0+",
     413,
     418
   ],
   [
-    "SPDX-License-Identifier:      LGPL-2.1+",
+    "SPDX-License-Identifier:     LGPL-2.1+",
     419,
     424
   ],
   [
-    "SPDX-License-Identifier:   GPL-2.0 LGPL-2.1",
+    "SPDX-License-Identifier:  GPL-2.0 LGPL-2.1",
     425,
     433
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex-readme.json b/tests/licensedcode/data/spdx/lines/complex-readme.json
index 1d223bc911a..4e6261414d4 100644
--- a/tests/licensedcode/data/spdx/lines/complex-readme.json
+++ b/tests/licensedcode/data/spdx/lines/complex-readme.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     140,
     166
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex-short.html.json b/tests/licensedcode/data/spdx/lines/complex-short.html.json
index 1aec76c2d1c..0f861143afd 100644
--- a/tests/licensedcode/data/spdx/lines/complex-short.html.json
+++ b/tests/licensedcode/data/spdx/lines/complex-short.html.json
@@ -1,11 +1,11 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     180,
     206
   ],
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     494,
     520
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex.c.json b/tests/licensedcode/data/spdx/lines/complex.c.json
index 1d223bc911a..4e6261414d4 100644
--- a/tests/licensedcode/data/spdx/lines/complex.c.json
+++ b/tests/licensedcode/data/spdx/lines/complex.c.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     140,
     166
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex.el.json b/tests/licensedcode/data/spdx/lines/complex.el.json
index 49f8ecc65df..b57b5869dcc 100644
--- a/tests/licensedcode/data/spdx/lines/complex.el.json
+++ b/tests/licensedcode/data/spdx/lines/complex.el.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  BSD-2-Clause",
+    "SPDX-License-Identifier: BSD-2-Clause",
     35,
     40
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex.html.json b/tests/licensedcode/data/spdx/lines/complex.html.json
index 15bf787e613..8163cc9c586 100644
--- a/tests/licensedcode/data/spdx/lines/complex.html.json
+++ b/tests/licensedcode/data/spdx/lines/complex.html.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     210,
     236
   ]
diff --git a/tests/licensedcode/data/spdx/lines/complex.java.json b/tests/licensedcode/data/spdx/lines/complex.java.json
index 2cc70e663e2..eab3b34edf1 100644
--- a/tests/licensedcode/data/spdx/lines/complex.java.json
+++ b/tests/licensedcode/data/spdx/lines/complex.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
+    "SPDX-License-Identifier: (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
     6,
     21
   ]
diff --git a/tests/licensedcode/data/spdx/lines/expression-with-notice-complex.java.json b/tests/licensedcode/data/spdx/lines/expression-with-notice-complex.java.json
index 1d223bc911a..4e6261414d4 100644
--- a/tests/licensedcode/data/spdx/lines/expression-with-notice-complex.java.json
+++ b/tests/licensedcode/data/spdx/lines/expression-with-notice-complex.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
     140,
     166
   ]
diff --git a/tests/licensedcode/data/spdx/lines/expression-with-notice.java.json b/tests/licensedcode/data/spdx/lines/expression-with-notice.java.json
index a9398fa086a..1c25e01f59a 100644
--- a/tests/licensedcode/data/spdx/lines/expression-with-notice.java.json
+++ b/tests/licensedcode/data/spdx/lines/expression-with-notice.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0",
     59,
     68
   ]
diff --git a/tests/licensedcode/data/spdx/lines/expression-with-notice2.java.json b/tests/licensedcode/data/spdx/lines/expression-with-notice2.java.json
index 5b467aedda7..9a15039bb38 100644
--- a/tests/licensedcode/data/spdx/lines/expression-with-notice2.java.json
+++ b/tests/licensedcode/data/spdx/lines/expression-with-notice2.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0",
+    "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0",
     73,
     82
   ]
diff --git a/tests/licensedcode/data/spdx/lines/genivi.c.json b/tests/licensedcode/data/spdx/lines/genivi.c.json
index 5bbe958d61d..cef32a1af5a 100644
--- a/tests/licensedcode/data/spdx/lines/genivi.c.json
+++ b/tests/licensedcode/data/spdx/lines/genivi.c.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX license identifier:  MPL-2.0",
+    "SPDX license identifier: MPL-2.0",
     0,
     5
   ]
diff --git a/tests/licensedcode/data/spdx/lines/licence.c.json b/tests/licensedcode/data/spdx/lines/licence.c.json
index 6ed50531267..5c74da7a70d 100644
--- a/tests/licensedcode/data/spdx/lines/licence.c.json
+++ b/tests/licensedcode/data/spdx/lines/licence.c.json
@@ -1,36 +1,36 @@
 [
   [
-    "SPDX-Licence-Identifier:  GPL-2.0+",
+    "SPDX-Licence-Identifier: GPL-2.0+",
     0,
     5
   ],
   [
-    "SPDX-Licence-Identifier:  GPL-2.0",
+    "SPDX-Licence-Identifier: GPL-2.0",
     6,
     11
   ],
   [
-    "SPDX-Licence-Identifier:  GPL-2.0+",
+    "SPDX-Licence-Identifier: GPL-2.0+",
     12,
     17
   ],
   [
-    "SPDX-Licence-Identifier:     GPL-2.0+",
+    "SPDX-Licence-Identifier:    GPL-2.0+",
     18,
     23
   ],
   [
-    "SPDX-Licence-Identifier:  BSD-3-Clause",
+    "SPDX-Licence-Identifier: BSD-3-Clause",
     24,
     29
   ],
   [
-    "SPDX-Licence-Identifier:  EUPL-1.2",
+    "SPDX-Licence-Identifier: EUPL-1.2",
     30,
     35
   ],
   [
-    "SPDX-Licence-Identifier:  LGPL-2.1+ The author added a static linking exception, see License.txt.",
+    "SPDX-Licence-Identifier: LGPL-2.1+ The author added a static linking exception, see License.txt.",
     36,
     50
   ]
diff --git a/tests/licensedcode/data/spdx/lines/linux.c.json b/tests/licensedcode/data/spdx/lines/linux.c.json
index 17bc751d6bb..1482f101401 100644
--- a/tests/licensedcode/data/spdx/lines/linux.c.json
+++ b/tests/licensedcode/data/spdx/lines/linux.c.json
@@ -1,171 +1,171 @@
 [
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     0,
     5
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     6,
     11
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     12,
     17
   ],
   [
-    "SPDX-License-Identifier:  GPL-1.0+",
+    "SPDX-License-Identifier: GPL-1.0+",
     18,
     23
   ],
   [
-    "SPDX-License-Identifier:  GPL-1.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */",
     24,
     33
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     34,
     39
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     40,
     45
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     46,
     51
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     52,
     57
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     58,
     63
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     64,
     69
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     70,
     75
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     76,
     81
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0 */",
+    "SPDX-License-Identifier: GPL-2.0 */",
     82,
     87
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ */",
+    "SPDX-License-Identifier: GPL-2.0+ */",
     88,
     93
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     94,
     99
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR BSD-2-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)",
     100,
     109
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)",
     110,
     119
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)",
     120,
     129
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR BSD-3-Clause)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)",
     130,
     139
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR MIT)",
+    "SPDX-License-Identifier: (GPL-2.0 OR MIT)",
     140,
     147
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0+ OR MIT)",
+    "SPDX-License-Identifier: (GPL-2.0+ OR MIT)",
     148,
     155
   ],
   [
-    "SPDX-License-Identifier:  (GPL-2.0 OR MPL-1.1)",
+    "SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)",
     156,
     165
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0 WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */",
     166,
     175
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */",
     176,
     185
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */",
     186,
     197
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */",
     198,
     211
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */",
     212,
     225
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */",
+    "SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */",
     226,
     239
   ],
   [
-    "SPDX-License-Identifier:  ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */",
+    "SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */",
     240,
     251
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.0+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */",
     252,
     261
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+",
+    "SPDX-License-Identifier: LGPL-2.1+",
     262,
     267
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1 WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */",
     268,
     277
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+ WITH Linux-syscall-note */",
+    "SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */",
     278,
     287
   ]
diff --git a/tests/licensedcode/data/spdx/lines/misc.c.json b/tests/licensedcode/data/spdx/lines/misc.c.json
index 3f7c1e1f318..bda6ea37020 100644
--- a/tests/licensedcode/data/spdx/lines/misc.c.json
+++ b/tests/licensedcode/data/spdx/lines/misc.c.json
@@ -1,91 +1,91 @@
 [
   [
-    "SPDX-License-Identifier:  Apache-2.0",
+    "SPDX-License-Identifier: Apache-2.0",
     5,
     10
   ],
   [
-    "SPDX-License-Identifier:  Unlicense",
+    "SPDX-License-Identifier: Unlicense",
     18,
     21
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     23,
     28
   ],
   [
-    "SPDX-License-Identifier:  Apache-2.0",
+    "SPDX-License-Identifier: Apache-2.0",
     44,
     49
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+",
+    "SPDX-License-Identifier:     GPL-2.0+",
     50,
     55
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     56,
     61
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+",
+    "SPDX-License-Identifier: LGPL-2.1+",
     62,
     67
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ */",
+    "SPDX-License-Identifier: GPL-2.0+ */",
     68,
     73
   ],
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     83,
     86
   ],
   [
-    "SPDX-License-Identifier:  (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
+    "SPDX-License-Identifier: (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)",
     141,
     156
   ],
   [
-    "SPDX-License-Identifier:  Apache-2.0",
+    "SPDX-License-Identifier: Apache-2.0",
     158,
     163
   ],
   [
-    "SPDX-License-Identifier:    AGPL-3.0",
+    "SPDX-License-Identifier:   AGPL-3.0",
     171,
     176
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause. import",
+    "SPDX-License-Identifier: BSD-3-Clause. import",
     177,
     183
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     184,
     189
   ],
   [
-    "SPDX-License-Identifier:  BSD-2-Clause-NetBSD",
+    "SPDX-License-Identifier: BSD-2-Clause-NetBSD",
     191,
     197
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.",
+    "SPDX-License-Identifier: GPL-2.",
     213,
     217
   ],
   [
-    "SPDX-License-Identifier:  CC-BY-4.0",
+    "SPDX-License-Identifier: CC-BY-4.0",
     279,
     285
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+\". Is there any reason we shouldn't go ahead with this?",
+    "SPDX-License-Identifier: GPL-2.0+\". Is there any reason we shouldn't go ahead with this?",
     308,
     324
   ]
diff --git a/tests/licensedcode/data/spdx/lines/misc2.c.json b/tests/licensedcode/data/spdx/lines/misc2.c.json
index 401826ecedf..4ff3500dd1f 100644
--- a/tests/licensedcode/data/spdx/lines/misc2.c.json
+++ b/tests/licensedcode/data/spdx/lines/misc2.c.json
@@ -1,46 +1,46 @@
 [
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     2,
     5
   ],
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     14,
     17
   ],
   [
-    "SPDX-License-Identifier:     BSD-3-Clause",
+    "SPDX-License-Identifier:    BSD-3-Clause",
     81,
     86
   ],
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     99,
     102
   ],
   [
-    "SPDX-License-Identifier:  BSD-2-Clause",
+    "SPDX-License-Identifier: BSD-2-Clause",
     122,
     127
   ],
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     136,
     139
   ],
   [
-    "SPDX-License-Identifier:  LGPL-3.0+",
+    "SPDX-License-Identifier: LGPL-3.0+",
     145,
     150
   ],
   [
-    "SPDX-License-Identifier:  AGPL-3.0",
+    "SPDX-License-Identifier: AGPL-3.0",
     158,
     163
   ],
   [
-    "SPDX-License-Identifier:  Apache-2.0",
+    "SPDX-License-Identifier: Apache-2.0",
     170,
     175
   ]
diff --git a/tests/licensedcode/data/spdx/lines/misc2.java.json b/tests/licensedcode/data/spdx/lines/misc2.java.json
index e5bd89cf399..674f4d7c879 100644
--- a/tests/licensedcode/data/spdx/lines/misc2.java.json
+++ b/tests/licensedcode/data/spdx/lines/misc2.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  BSD-2-Clause",
+    "SPDX-License-Identifier: BSD-2-Clause",
     5,
     10
   ]
diff --git a/tests/licensedcode/data/spdx/lines/misc3.c.json b/tests/licensedcode/data/spdx/lines/misc3.c.json
index 74c4a66df5d..2b15fd84fc9 100644
--- a/tests/licensedcode/data/spdx/lines/misc3.c.json
+++ b/tests/licensedcode/data/spdx/lines/misc3.c.json
@@ -1,11 +1,11 @@
 [
   [
-    "SPDX-License-Identifier:         GPL-2.0+        BSD-3-Clause",
+    "SPDX-License-Identifier:        GPL-2.0+        BSD-3-Clause",
     0,
     8
   ],
   [
-    "SPDX license identifier:  MPL-2.0.",
+    "SPDX license identifier: MPL-2.0.",
     9,
     14
   ]
diff --git a/tests/licensedcode/data/spdx/lines/mit-with-disclaimer.c.json b/tests/licensedcode/data/spdx/lines/mit-with-disclaimer.c.json
index 1ffce2c2fb5..ae8831f2174 100644
--- a/tests/licensedcode/data/spdx/lines/mit-with-disclaimer.c.json
+++ b/tests/licensedcode/data/spdx/lines/mit-with-disclaimer.c.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  MIT",
+    "SPDX-License-Identifier: MIT",
     7,
     10
   ]
diff --git a/tests/licensedcode/data/spdx/lines/mixed.go.json b/tests/licensedcode/data/spdx/lines/mixed.go.json
index 378f0e73642..3ba4b5632f9 100644
--- a/tests/licensedcode/data/spdx/lines/mixed.go.json
+++ b/tests/licensedcode/data/spdx/lines/mixed.go.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  Apache-2.0",
+    "SPDX-License-Identifier: Apache-2.0",
     99,
     104
   ]
diff --git a/tests/licensedcode/data/spdx/lines/mixed.java.json b/tests/licensedcode/data/spdx/lines/mixed.java.json
index 5235d3a18f1..dbb033ada8c 100644
--- a/tests/licensedcode/data/spdx/lines/mixed.java.json
+++ b/tests/licensedcode/data/spdx/lines/mixed.java.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  AGPL-3.0",
+    "SPDX-License-Identifier: AGPL-3.0",
     7,
     12
   ]
diff --git a/tests/licensedcode/data/spdx/lines/oldplus.txt.json b/tests/licensedcode/data/spdx/lines/oldplus.txt.json
index 33676089ac2..1ddbebceaea 100644
--- a/tests/licensedcode/data/spdx/lines/oldplus.txt.json
+++ b/tests/licensedcode/data/spdx/lines/oldplus.txt.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:      GPL-2.0+ or X11",
+    "SPDX-License-Identifier:     GPL-2.0+ or X11",
     0,
     7
   ]
diff --git a/tests/licensedcode/data/spdx/lines/reuse.py.json b/tests/licensedcode/data/spdx/lines/reuse.py.json
index 13f9a3cf3fc..7d81672214c 100644
--- a/tests/licensedcode/data/spdx/lines/reuse.py.json
+++ b/tests/licensedcode/data/spdx/lines/reuse.py.json
@@ -1,6 +1,6 @@
 [
   [
-    "SPDX-License-Identifier:  GPL-3.0+",
+    "SPDX-License-Identifier: GPL-3.0+",
     124,
     129
   ]
diff --git a/tests/licensedcode/data/spdx/lines/spdx-v3.txt.json b/tests/licensedcode/data/spdx/lines/spdx-v3.txt.json
index 939180395dc..e82d2a444bb 100644
--- a/tests/licensedcode/data/spdx/lines/spdx-v3.txt.json
+++ b/tests/licensedcode/data/spdx/lines/spdx-v3.txt.json
@@ -1,21 +1,21 @@
 [
   [
-    "SPDX-License-Identifier:      GPL-2.0-or-later",
+    "SPDX-License-Identifier:     GPL-2.0-or-later",
     0,
     7
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0-or-later",
+    "SPDX-License-Identifier:     GPL-2.0-or-later",
     8,
     15
   ],
   [
-    "SPDX-License-Identifier:  MIT AND GPL-2.0-or-later",
+    "SPDX-License-Identifier: MIT AND GPL-2.0-or-later",
     16,
     25
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+.",
+    "SPDX-License-Identifier: LGPL-2.1+.",
     26,
     31
   ]
diff --git a/tests/licensedcode/data/spdx/lines/uboot.c.json b/tests/licensedcode/data/spdx/lines/uboot.c.json
index f015552732a..1293da382fb 100644
--- a/tests/licensedcode/data/spdx/lines/uboot.c.json
+++ b/tests/licensedcode/data/spdx/lines/uboot.c.json
@@ -1,196 +1,196 @@
 [
   [
-    "SPDX-License-Identifier: \" line references more than one Unique",
+    "SPDX-License-Identifier:\" line references more than one Unique",
     1,
     9
   ],
   [
-    "SPDX-License-Identifier:  BSD-2-Clause",
+    "SPDX-License-Identifier: BSD-2-Clause",
     10,
     15
   ],
   [
-    "SPDX-License-Identifier:     BSD-3-Clause",
+    "SPDX-License-Identifier:    BSD-3-Clause",
     16,
     21
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     22,
     27
   ],
   [
-    "SPDX-License-Identifier:  BSD-3-Clause",
+    "SPDX-License-Identifier: BSD-3-Clause",
     28,
     33
   ],
   [
-    "SPDX-License-Identifier:  eCos-2.0",
+    "SPDX-License-Identifier: eCos-2.0",
     34,
     39
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     40,
     45
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0",
+    "SPDX-License-Identifier:     GPL-2.0",
     46,
     51
   ],
   [
-    "SPDX-License-Identifier:         GPL-2.0+",
+    "SPDX-License-Identifier:        GPL-2.0+",
     52,
     57
   ],
   [
-    "SPDX-License-Identifier:       GPL-2.0+",
+    "SPDX-License-Identifier:      GPL-2.0+",
     58,
     63
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0",
+    "SPDX-License-Identifier:     GPL-2.0",
     64,
     69
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+",
+    "SPDX-License-Identifier:     GPL-2.0+",
     70,
     75
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     76,
     81
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     82,
     87
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     88,
     93
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     94,
     99
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     100,
     105
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     106,
     111
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0",
+    "SPDX-License-Identifier:    GPL-2.0",
     112,
     117
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     118,
     123
   ],
   [
-    "SPDX-License-Identifier:       GPL-2.0+",
+    "SPDX-License-Identifier:      GPL-2.0+",
     124,
     129
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+",
+    "SPDX-License-Identifier:     GPL-2.0+",
     130,
     135
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     136,
     141
   ],
   [
-    "SPDX-License-Identifier:   GPL-2.0+",
+    "SPDX-License-Identifier:  GPL-2.0+",
     142,
     147
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0",
+    "SPDX-License-Identifier: GPL-2.0",
     148,
     153
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+",
+    "SPDX-License-Identifier: GPL-2.0+",
     154,
     159
   ],
   [
-    "SPDX-License-Identifier:   GPL-2.0",
+    "SPDX-License-Identifier:  GPL-2.0",
     160,
     165
   ],
   [
-    "SPDX-License-Identifier:   GPL-2.0+",
+    "SPDX-License-Identifier:  GPL-2.0+",
     166,
     171
   ],
   [
-    "SPDX-License-Identifier:      GPL-2.0+",
+    "SPDX-License-Identifier:     GPL-2.0+",
     172,
     177
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     178,
     183
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+",
+    "SPDX-License-Identifier:    GPL-2.0+",
     184,
     189
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+ BSD-2-Clause",
+    "SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause",
     190,
     198
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+    BSD-2-Clause",
+    "SPDX-License-Identifier: GPL-2.0+    BSD-2-Clause",
     199,
     207
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0+    BSD-3-Clause",
+    "SPDX-License-Identifier: GPL-2.0+    BSD-3-Clause",
     208,
     216
   ],
   [
-    "SPDX-License-Identifier:     GPL-2.0+    BSD-3-Clause",
+    "SPDX-License-Identifier:    GPL-2.0+    BSD-3-Clause",
     217,
     225
   ],
   [
-    "SPDX-License-Identifier:  GPL-2.0 IBM-pibs",
+    "SPDX-License-Identifier: GPL-2.0 IBM-pibs",
     226,
     233
   ],
   [
-    "SPDX-License-Identifier:   ISC",
+    "SPDX-License-Identifier:  ISC",
     234,
     237
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.0+",
+    "SPDX-License-Identifier: LGPL-2.0+",
     238,
     243
   ],
   [
-    "SPDX-License-Identifier:  LGPL-2.1+",
+    "SPDX-License-Identifier: LGPL-2.1+",
     244,
     249
   ]
diff --git a/tests/licensedcode/test_match_spdx_lid.py b/tests/licensedcode/test_match_spdx_lid.py
index a359b1bb830..e2c4470c406 100644
--- a/tests/licensedcode/test_match_spdx_lid.py
+++ b/tests/licensedcode/test_match_spdx_lid.py
@@ -74,9 +74,9 @@ def test_Query_with_spdx_basic(self):
 
         qry = Query(query_string=querys, idx=idx)
         expected = [
-            ('SPDX-License-Identifier:  (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)',  0,  15),
-            ('SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0',16,  34),
-            ('SPDX-License-Identifier:      GPL-2.0+ BSD-2-Clause', 45, 53)]
+            ('SPDX-License-Identifier: (BSD-3-Clause OR EPL-1.0 OR Apache-2.0 OR MIT)',  0,  15),
+            ('SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0',16,  34),
+            ('SPDX-License-Identifier:     GPL-2.0+ BSD-2-Clause', 45, 53)]
 
         assert qry.spdx_lines == expected
 
@@ -98,10 +98,10 @@ def test_Query_with_spdx_basic(self):
 
         qry = Query(query_string=querys, idx=idx)
         expected = [
-            ('licenses.nuget.org /(LGPL-2.0-only WITH FLTK-exception OR Apache-2.0)',  1,  14),
-            ('SPDX-License-Identifier:  EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0',15,  33),
-            ('licenses.nuget.org /MIT', 45, 48),
-            ('licenses.nuget.org /(MIT)', 50, 53)
+            ('licenses.nuget.org/(LGPL-2.0-only WITH FLTK-exception OR Apache-2.0)',  1,  14),
+            ('SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0',15,  33),
+            ('licenses.nuget.org/MIT', 45, 48),
+            ('licenses.nuget.org/(MIT)', 50, 53)
         ]
 
         assert qry.spdx_lines == expected
diff --git a/tests/licensedcode/test_plugin_license.py b/tests/licensedcode/test_plugin_license.py
index 5e3f3b56674..be41a2b863f 100644
--- a/tests/licensedcode/test_plugin_license.py
+++ b/tests/licensedcode/test_plugin_license.py
@@ -46,11 +46,15 @@ def test_license_detection_plugin_works():
     check_json_scan(test_loc, result_file, regen=REGEN_TEST_FIXTURES)
 
 
-def test_license_option_reports_license_expressions():
+def test_license_option_reports_license_expressions_misc():
     test_dir = test_env.get_test_loc('plugin_license/license-expression/scan', copy=True)
     result_file = test_env.get_temp_file('json')
     args = [
         '--license',
+        '--license-text',
+        '--license-text-diagnostics',
+        '--license-diagnostics',
+        '--license-references',
         '--strip-root',
         '--verbose',
         '--json', result_file,
@@ -69,6 +73,7 @@ def test_license_option_reports_license_expressions_spdx_nuget():
         '--license-text',
         '--license-text-diagnostics',
         '--license-diagnostics',
+        '--license-references',
         '--strip-root',
         '--verbose',
         '--json', result_file,
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 3a18139a94e..bdde87d0ea3 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
@@ -41,17 +41,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -253,17 +253,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -357,17 +357,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -506,17 +506,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -718,17 +718,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -1173,22 +1173,22 @@
         "license_expression_spdx": "MPL-2.0 AND MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mpl-2.0 AND mit",
+            "spdx_license_expression": "MPL-2.0 AND MIT",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 5,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mpl-2.0 AND mit",
-            "spdx_license_expression": "MPL-2.0 AND MIT",
-            "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mpl_2_0_and_mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
             "rule_url": null,
             "matched_text": "mpl-2.0 AND mit"
           }
         ],
-        "identifier": "mpl_2_0_and_mit-988cb9df-c9be-c91d-c7e4-896f96e84eb8"
+        "identifier": "mpl_2_0_and_mit-0ec4a3d2-4f7b-39d7-f14f-8bb7666de6d5"
       }
     ],
     "other_license_expression": null,
@@ -1277,22 +1277,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1471,22 +1471,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1575,17 +1575,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1667,17 +1667,17 @@
         "license_expression_spdx": "Zlib",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "zlib",
-            "spdx_license_expression": "Zlib",
-            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_url": null,
             "matched_text": "zlib"
           }
@@ -1771,17 +1771,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1872,17 +1872,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1964,22 +1964,22 @@
         "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "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",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 11,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "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",
-            "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_url": null,
             "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
           }
         ],
-        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
       }
     ],
     "other_license_expression": null,
@@ -2092,22 +2092,22 @@
         "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "bsd-simplified AND bsd-new",
+            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
             "start_line": 1,
             "end_line": 1,
-            "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 7,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "bsd-simplified AND bsd-new",
-            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-            "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_url": null,
             "matched_text": "bsd-2-clause AND bsd-3-clause"
           }
         ],
-        "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+        "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
       }
     ],
     "other_license_expression": null,
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 b54937ae56e..fdb5816a85b 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
@@ -42,17 +42,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -135,17 +135,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -228,17 +228,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -321,17 +321,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -432,17 +432,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -687,22 +687,22 @@
           "license_expression_spdx": "MPL-2.0 AND MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0 AND mit",
+              "spdx_license_expression": "MPL-2.0 AND MIT",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mpl-2.0 AND mit",
-              "spdx_license_expression": "MPL-2.0 AND MIT",
-              "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mpl_2_0_and_mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_url": null,
               "matched_text": "mpl-2.0 AND mit"
             }
           ],
-          "identifier": "mpl_2_0_and_mit-988cb9df-c9be-c91d-c7e4-896f96e84eb8"
+          "identifier": "mpl_2_0_and_mit-0ec4a3d2-4f7b-39d7-f14f-8bb7666de6d5"
         }
       ],
       "other_license_expression": null,
@@ -780,22 +780,22 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_url": null,
               "matched_text": "openssl"
             }
           ],
-          "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+          "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
         }
       ],
       "other_license_expression": null,
@@ -882,22 +882,22 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_url": null,
               "matched_text": "openssl"
             }
           ],
-          "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+          "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
         }
       ],
       "other_license_expression": null,
@@ -975,17 +975,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1056,17 +1056,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_url": null,
               "matched_text": "zlib"
             }
@@ -1149,17 +1149,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1230,17 +1230,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1311,22 +1311,22 @@
           "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_url": null,
               "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
             }
           ],
-          "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+          "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
         }
       ],
       "other_license_expression": null,
@@ -1392,22 +1392,22 @@
           "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-simplified AND bsd-new",
+              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "bsd-simplified AND bsd-new",
-              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-              "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_url": null,
               "matched_text": "bsd-2-clause AND bsd-3-clause"
             }
           ],
-          "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+          "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
         }
       ],
       "other_license_expression": null,
@@ -2217,17 +2217,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -2421,17 +2421,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -2517,17 +2517,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -2658,17 +2658,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -2873,17 +2873,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -3320,22 +3320,22 @@
               "license_expression_spdx": "MPL-2.0 AND MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0 AND mit",
+                  "spdx_license_expression": "MPL-2.0 AND MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mpl-2.0 AND mit",
-                  "spdx_license_expression": "MPL-2.0 AND MIT",
-                  "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mpl_2_0_and_mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_url": null,
                   "matched_text": "mpl-2.0 AND mit"
                 }
               ],
-              "identifier": "mpl_2_0_and_mit-988cb9df-c9be-c91d-c7e4-896f96e84eb8"
+              "identifier": "mpl_2_0_and_mit-0ec4a3d2-4f7b-39d7-f14f-8bb7666de6d5"
             }
           ],
           "other_license_expression": null,
@@ -3416,22 +3416,22 @@
               "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "openssl-ssleay",
-                  "spdx_license_expression": "OpenSSL",
-                  "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_url": null,
                   "matched_text": "openssl"
                 }
               ],
-              "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+              "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
             }
           ],
           "other_license_expression": null,
@@ -3602,22 +3602,22 @@
               "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "openssl-ssleay",
-                  "spdx_license_expression": "OpenSSL",
-                  "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_url": null,
                   "matched_text": "openssl"
                 }
               ],
-              "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+              "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
             }
           ],
           "other_license_expression": null,
@@ -3698,17 +3698,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -3785,17 +3785,17 @@
               "license_expression_spdx": "Zlib",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_url": null,
                   "matched_text": "zlib"
                 }
@@ -3881,17 +3881,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -3998,17 +3998,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -4085,22 +4085,22 @@
               "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "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",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 11,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "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",
-                  "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_url": null,
                   "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
                 }
               ],
-              "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+              "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
             }
           ],
           "other_license_expression": null,
@@ -4219,22 +4219,22 @@
               "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-simplified AND bsd-new",
+                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "bsd-simplified AND bsd-new",
-                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-                  "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_url": null,
                   "matched_text": "bsd-2-clause AND bsd-3-clause"
                 }
               ],
-              "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+              "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
             }
           ],
           "other_license_expression": null,
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 7575409f00d..3f959e7e5c2 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 21,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.0-or-later AND (lgpl-2.1-only OR lgpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-83adb4fe-159a-e6dc-3d99-9ae9f8f42d4c"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-af062053-aab4-2eb5-fdbd-d9bc8654417f"
     }
   ],
   "other_license_expression": null,
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 e684808daef..fa31963e042 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND gfdl-1.2-71479f146df396347c1f389292ea4ade2de988be",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_gfdl_1_2-71479f146df396347c1f389292ea4ade2de988be",
           "rule_url": null,
           "matched_text": "lgpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only) AND gfdl-1.2-only"
         }
       ],
-      "identifier": "lgpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_gfdl_1_2-0c073d36-fb2b-d80b-34b6-4c73db0e409b"
+      "identifier": "lgpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_gfdl_1_2-03f4b2ba-8469-f8a4-7e3d-83270b11bea8"
     }
   ],
   "other_license_expression": null,
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 351e9451ae2..fcbcbbb9836 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 OR gpl-3.0",
+          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 OR gpl-3.0",
-          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 OR gpl-3.0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_or_gpl_3_0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_url": null,
           "matched_text": "gpl-2.0-only OR gpl-3.0-only"
         }
       ],
-      "identifier": "gpl_2_0_or_gpl_3_0-1482a965-2ea3-aada-781b-9d06277c5ddd"
+      "identifier": "gpl_2_0_or_gpl_3_0-6d4fcb03-6c88-45dd-54d0-62507ba1fc68"
     }
   ],
   "other_license_expression": null,
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 6b3eb82a16d..fbdd389c365 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
@@ -30,22 +30,22 @@
       "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",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 25,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND gpl-2.0-plus AND gpl-2.0 AND lgpl-2.1-807060997a907edbf6fb1afce31562a9d6562969",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_or_gpl_3_0__and_gpl_2_0_plus_and_gpl_2_0_and_lgpl_2_1-807060997a907edbf6fb1afce31562a9d6562969",
           "rule_url": null,
           "matched_text": "(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"
         }
       ],
-      "identifier": "gpl_2_0_or_gpl_3_0__and_gpl_2_0_plus_and_gpl_2_0_and_lgpl_2_1-1b4da3d8-041f-dfd5-e626-4c55180ea9ae"
+      "identifier": "gpl_2_0_or_gpl_3_0__and_gpl_2_0_plus_and_gpl_2_0_and_lgpl_2_1-8f048462-559a-272b-6df3-4f10e08d651d"
     }
   ],
   "other_license_expression": null,
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 482d8a1ca0a..4d99fab15ba 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "(GPL-2.0-only AND LGPL-2.1-only) OR LGPL-3.0-only",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 13,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-(gpl-2.0 AND lgpl-2.1) OR lgpl-3.0-877e4ca7bc57bbc791f042ee281cee48814e200c",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_and_lgpl_2_1__or_lgpl_3_0-877e4ca7bc57bbc791f042ee281cee48814e200c",
           "rule_url": null,
           "matched_text": "(gpl-2.0 AND lgpl-2.1-only) OR lgpl-3.0-only"
         }
       ],
-      "identifier": "gpl_2_0_and_lgpl_2_1__or_lgpl_3_0-dc9b447b-c24a-868f-c209-8afffba654c3"
+      "identifier": "gpl_2_0_and_lgpl_2_1__or_lgpl_3_0-c476f3e0-7488-11d9-4522-067de44d8e72"
     }
   ],
   "other_license_expression": null,
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 b77b32bab0d..afaa90fd6f7 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1 OR lgpl-3.0",
+          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "lgpl-2.1 OR lgpl-3.0",
-          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR lgpl-3.0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_or_lgpl_3_0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_url": null,
           "matched_text": "lgpl-2.1-only OR lgpl-3.0-only"
         }
       ],
-      "identifier": "lgpl_2_1_or_lgpl_3_0-be7ae560-9294-0599-bd4f-1ab529d49760"
+      "identifier": "lgpl_2_1_or_lgpl_3_0-ace3add4-15cc-ddf5-70c6-3c6914842c58"
     }
   ],
   "other_license_expression": null,
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 91d9dfd000f..ff5e4b00053 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.0-only AND GPL-2.0-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.0 AND gpl-2.0-plus",
+          "spdx_license_expression": "LGPL-2.0-only AND GPL-2.0-or-later",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "lgpl-2.0 AND gpl-2.0-plus",
-          "spdx_license_expression": "LGPL-2.0-only AND GPL-2.0-or-later",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.0 AND gpl-2.0-plus-c8002ee7804f7830bc06d8d26df9e3e5d861c339",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_0_and_gpl_2_0_plus-c8002ee7804f7830bc06d8d26df9e3e5d861c339",
           "rule_url": null,
           "matched_text": "lgpl-2.0-only AND gpl-2.0-or-later"
         }
       ],
-      "identifier": "lgpl_2_0_and_gpl_2_0_plus-e38cba7a-b5c9-19df-2db1-0119bcff551a"
+      "identifier": "lgpl_2_0_and_gpl_2_0_plus-39507fcb-cb9a-ad5a-76ca-445a5576ff2c"
     }
   ],
   "other_license_expression": null,
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 f15091c80c6..1ab837d84ca 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-only AND LGPL-2.0-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 AND lgpl-2.0-plus",
+          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.0-or-later",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 AND lgpl-2.0-plus",
-          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.0-or-later",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 AND lgpl-2.0-plus-ec90969a128367759b81f6978fe09ff5a121b9c9",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_and_lgpl_2_0_plus-ec90969a128367759b81f6978fe09ff5a121b9c9",
           "rule_url": null,
           "matched_text": "gpl-2.0-only AND lgpl-2.0-or-later"
         }
       ],
-      "identifier": "gpl_2_0_and_lgpl_2_0_plus-bc15a6b5-1584-4cd0-9210-2b3f06c3ef25"
+      "identifier": "gpl_2_0_and_lgpl_2_0_plus-3ccfcd9f-445c-fa6f-b608-1d420525a101"
     }
   ],
   "other_license_expression": null,
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 9aed2b04db4..511b70e22bf 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 19,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)-9138e20c7248ef0ad3b2f747b9f3cf4e17f3db2c",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-9138e20c7248ef0ad3b2f747b9f3cf4e17f3db2c",
           "rule_url": null,
           "matched_text": "(gpl-2.0-only OR gpl-3.0-only) AND (lgpl-2.1-only OR lgpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-af7de606-37a5-0f90-eedc-d41437abc947"
+      "identifier": "gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-764e4fcf-c931-1f61-60e4-6eacba5db5a1"
     }
   ],
   "other_license_expression": null,
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 73f18c88684..f661be157ec 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_1_plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.1-or-later"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-4e8606b0-51c5-4a74-8e25-cdd2d1a57b32"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-677d1fb8-7806-aa9e-d8da-efb0aa8f47e7"
     }
   ],
   "other_license_expression": null,
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 da5b2e89eeb..2f6e798b294 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 15,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-f238bbf0-8b89-61be-9532-1d69152e871f"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-437f902c-95a1-58de-338a-ce87eb16fbcb"
     }
   ],
   "other_license_expression": null,
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 6bd5803e6ed..1f69989c255 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "lgpl-2.1 OR lgpl-3.0",
+          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "lgpl-2.1 OR lgpl-3.0",
-          "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR lgpl-3.0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_or_lgpl_3_0-e4927f7ed1ca2211b75c4c4b498140cdc67e340b",
           "rule_url": null,
           "matched_text": "lgpl-2.1-only OR lgpl-3.0-only"
         }
       ],
-      "identifier": "lgpl_2_1_or_lgpl_3_0-be7ae560-9294-0599-bd4f-1ab529d49760"
+      "identifier": "lgpl_2_1_or_lgpl_3_0-ace3add4-15cc-ddf5-70c6-3c6914842c58"
     }
   ],
   "other_license_expression": null,
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 4e4a00f8068..c535bfe0e5b 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only) AND lgpl-2.1-only"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-63c22468-d089-42e4-0345-fcb447c981c1"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-a48280a4-549b-0102-7c40-4c946e73e4b3"
     }
   ],
   "other_license_expression": null,
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 bf9eca6fe80..cf80f9d2f3e 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-f6e235567e8c0f3615b6e0cf705ff2198e12b95a",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only) AND lgpl-2.1-only"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-63c22468-d089-42e4-0345-fcb447c981c1"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1-a48280a4-549b-0102-7c40-4c946e73e4b3"
     }
   ],
   "other_license_expression": null,
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 70174798e4e..0d4e95517a9 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 15,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-ce4c78ee41a3e336943864361ed11d000f9d99e9",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-f238bbf0-8b89-61be-9532-1d69152e871f"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-437f902c-95a1-58de-338a-ce87eb16fbcb"
     }
   ],
   "other_license_expression": null,
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 da53960c2fc..35898eb82d4 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-or-later AND GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 21,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1-plus AND gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)-42c579dc301f74170657fd26e8c1f4a629633b3e",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_plus_and_gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-42c579dc301f74170657fd26e8c1f4a629633b3e",
           "rule_url": null,
           "matched_text": "lgpl-2.1-or-later AND gpl-2.0-or-later AND (gpl-2.0-only OR gpl-3.0-only)"
         }
       ],
-      "identifier": "lgpl_2_1_plus_and_gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-e1d4dc9c-9f75-3ae1-db9f-5af2bf2e9853"
+      "identifier": "lgpl_2_1_plus_and_gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0-0b9f8884-60ab-ae33-7510-9a9faad53750"
     }
   ],
   "other_license_expression": null,
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 f84296e9012..f9004df6f97 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-or-later AND (GPL-2.0-only OR GPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 15,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1-plus AND (gpl-2.0 OR gpl-3.0)-5576b785bcf8108f0c7a5eb9a15c91087b4a9aad",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_plus_and__gpl_2_0_or_gpl_3_0-5576b785bcf8108f0c7a5eb9a15c91087b4a9aad",
           "rule_url": null,
           "matched_text": "lgpl-2.1-or-later AND (gpl-2.0-only OR gpl-3.0-only)"
         }
       ],
-      "identifier": "lgpl_2_1_plus_and__gpl_2_0_or_gpl_3_0-28f4d4fc-e13e-e4a3-8805-38847c982bf7"
+      "identifier": "lgpl_2_1_plus_and__gpl_2_0_or_gpl_3_0-73704154-ee23-b1b4-cd7b-f9d0cb2defa7"
     }
   ],
   "other_license_expression": null,
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 3e74306fbd0..6c37d66d102 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
@@ -30,22 +30,22 @@
       "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)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 25,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)-f2624eb417fc2a933301bad7d7d05a012dd774a8",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-f2624eb417fc2a933301bad7d7d05a012dd774a8",
           "rule_url": null,
           "matched_text": "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)"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-345ce69e-75f5-e574-5baf-b963fb163581"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and__lgpl_2_1_or_lgpl_3_0-3f1e2915-87a3-5fe0-b43e-f216cae5570b"
     }
   ],
   "other_license_expression": null,
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 4bfc2ed2c8e..d65e8b9bcb9 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-only AND LGPL-2.1-only",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 AND lgpl-2.1",
+          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.1-only",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 AND lgpl-2.1",
-          "spdx_license_expression": "GPL-2.0-only AND LGPL-2.1-only",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 AND lgpl-2.1-89e25548a98f2cc78ea3207284de00386e9cca56",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_and_lgpl_2_1-89e25548a98f2cc78ea3207284de00386e9cca56",
           "rule_url": null,
           "matched_text": "gpl-2.0-only AND lgpl-2.1-only"
         }
       ],
-      "identifier": "gpl_2_0_and_lgpl_2_1-49d5a49e-a60f-781c-8d71-fea7dd168ff2"
+      "identifier": "gpl_2_0_and_lgpl_2_1-7ffb228e-a2fa-1b2d-5cf6-21408d94633b"
     }
   ],
   "other_license_expression": null,
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 58cb953ab8e..b8599062add 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
@@ -30,22 +30,22 @@
       "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)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 36,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-(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)-3017fe0de3ce4010ecfd72d730a3209c094143fb",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-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-3017fe0de3ce4010ecfd72d730a3209c094143fb",
           "rule_url": null,
           "matched_text": "(lgpl-2.1-only OR lgpl-3.0-only) AND lgpl-2.1-only AND (lgpl-2.1-only WITH nokia-qt-exception-1.1 OR gpl-3.0-only WITH nokia-qt-exception-1.1)"
         }
       ],
-      "identifier": "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-9e166793-0625-fd57-517a-fe7395ccb817"
+      "identifier": "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-ca3a8423-40d6-60f4-21b7-ca3034f24a3e"
     }
   ],
   "other_license_expression": null,
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 4dcfbb4a76b..b714c155144 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_1_plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.1-or-later"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-4e8606b0-51c5-4a74-8e25-cdd2d1a57b32"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-677d1fb8-7806-aa9e-d8da-efb0aa8f47e7"
     }
   ],
   "other_license_expression": null,
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 9eb4048d963..ef7d5de792b 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 15,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-(lgpl-2.1 OR lgpl-3.0) AND lgpl-2.0-plus-7dea9e47d5bf4a2a09cf2f861f69abe368ccb3f4",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_or_lgpl_3_0__and_lgpl_2_0_plus-7dea9e47d5bf4a2a09cf2f861f69abe368ccb3f4",
           "rule_url": null,
           "matched_text": "(lgpl-2.1-only OR lgpl-3.0-only) AND lgpl-2.0-or-later"
         }
       ],
-      "identifier": "lgpl_2_1_or_lgpl_3_0__and_lgpl_2_0_plus-be098681-dd6f-4c90-2a26-f36bc70bfc04"
+      "identifier": "lgpl_2_1_or_lgpl_3_0__and_lgpl_2_0_plus-efebb3d9-03a6-6334-4a4a-1be7140fbe92"
     }
   ],
   "other_license_expression": null,
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 60924407a13..28560628d4d 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-only OR (LGPL-3.0-only AND GPL-2.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 14,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR (lgpl-3.0 AND gpl-2.0)-534186cd80fee338c6272bb9dda85611148c66e8",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_or__lgpl_3_0_and_gpl_2_0-534186cd80fee338c6272bb9dda85611148c66e8",
           "rule_url": null,
           "matched_text": "lgpl-2.1-only OR (lgpl-3.0-only AND gpl-2.0-only)"
         }
       ],
-      "identifier": "lgpl_2_1_or__lgpl_3_0_and_gpl_2_0-49eb4b12-74d5-c6c5-f58a-ba256adffb34"
+      "identifier": "lgpl_2_1_or__lgpl_3_0_and_gpl_2_0-739c5c43-c8d1-16b6-0a84-9fbd439e1766"
     }
   ],
   "other_license_expression": null,
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 965bbe8db20..62706cfe121 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_1_plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.1-or-later"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-4e8606b0-51c5-4a74-8e25-cdd2d1a57b32"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-677d1fb8-7806-aa9e-d8da-efb0aa8f47e7"
     }
   ],
   "other_license_expression": null,
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 34d3b0b05aa..3f931b950f7 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-kde-accepted-gpl AND LicenseRef-scancode-kde-accepted-lgpl AND CC0-1.0",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 13,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-kde-accepted-gpl AND kde-accepted-lgpl AND cc0-1.0-6a9624535224bcf1a0f54065c5d93440ca135f98",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-kde_accepted_gpl_and_kde_accepted_lgpl_and_cc0_1_0-6a9624535224bcf1a0f54065c5d93440ca135f98",
           "rule_url": null,
           "matched_text": "licenseref-kde-accepted-gpl AND licenseref-kde-accepted-lgpl AND cc0-1.0"
         }
       ],
-      "identifier": "kde_accepted_gpl_and_kde_accepted_lgpl_and_cc0_1_0-9bee625b-21fc-09c5-d92b-5f0aeaba0d98"
+      "identifier": "kde_accepted_gpl_and_kde_accepted_lgpl_and_cc0_1_0-0b51d18e-e172-95d7-85c5-dad9ef971d11"
     }
   ],
   "other_license_expression": null,
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 e93ff9a0f52..8a7ad53b596 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-2.0 OR gpl-3.0",
+          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-2.0 OR gpl-3.0",
-          "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0 OR gpl-3.0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_or_gpl_3_0-ebaae67e1dae7287bcefcb6037a4ae01d28150bb",
           "rule_url": null,
           "matched_text": "gpl-2.0-only OR gpl-3.0-only"
         }
       ],
-      "identifier": "gpl_2_0_or_gpl_3_0-1482a965-2ea3-aada-781b-9d06277c5ddd"
+      "identifier": "gpl_2_0_or_gpl_3_0-6d4fcb03-6c88-45dd-54d0-62507ba1fc68"
     }
   ],
   "other_license_expression": null,
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 bc6ac8d0107..cce09c3ff54 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 19,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 AND lgpl-3.0)-2cb11bcdf63224f750de9a8729634e1605256e50",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_or_gpl_3_0__and__lgpl_2_1_and_lgpl_3_0-2cb11bcdf63224f750de9a8729634e1605256e50",
           "rule_url": null,
           "matched_text": "(gpl-2.0-only OR gpl-3.0-only) AND (lgpl-2.1-only AND lgpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_or_gpl_3_0__and__lgpl_2_1_and_lgpl_3_0-70c43909-f750-eafa-7ac9-62b9d78846af"
+      "identifier": "gpl_2_0_or_gpl_3_0__and__lgpl_2_1_and_lgpl_3_0-d3388c35-b03c-abe5-a82a-6dce740bbd2f"
     }
   ],
   "other_license_expression": null,
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 e761aee77be..7938b813a92 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
@@ -30,22 +30,22 @@
       "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",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 49,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-(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-03672b2a90402ac498ea76c8d3bb32c9fc13e415",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-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-03672b2a90402ac498ea76c8d3bb32c9fc13e415",
           "rule_url": null,
           "matched_text": "(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"
         }
       ],
-      "identifier": "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-71072563-b3fe-cfc8-ebdf-b09319ea9248"
+      "identifier": "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-2d4d0246-85b0-1c37-0203-dbdd6c824816"
     }
   ],
   "other_license_expression": null,
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 edb07d59c68..e111ee9240e 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)",
       "matches": [
         {
-          "score": 100.0,
+          "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)",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 21,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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)",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-b7eafc9b966222982218b5cba903dd77b43f0540",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.0-or-later AND (lgpl-2.1-only OR lgpl-3.0-only)"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-83adb4fe-159a-e6dc-3d99-9ae9f8f42d4c"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_0_plus_and__lgpl_2_1_or_lgpl_3_0-af062053-aab4-2eb5-fdbd-d9bc8654417f"
     }
   ],
   "other_license_expression": null,
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 eb888a83a82..a49177eb6a0 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "kde-accepted-lgpl AND kfqf-accepted-gpl",
+          "spdx_license_expression": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 9,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "kde-accepted-lgpl AND kfqf-accepted-gpl",
-          "spdx_license_expression": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl",
-          "rule_identifier": "spdx-license-identifier-kde-accepted-lgpl AND kfqf-accepted-gpl-d97defd08863e41010f561c03741f2df5e14dc33",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-kde_accepted_lgpl_and_kfqf_accepted_gpl-d97defd08863e41010f561c03741f2df5e14dc33",
           "rule_url": null,
           "matched_text": "licenseref-kde-accepted-lgpl AND licenseref-kfqf-accepted-gpl"
         }
       ],
-      "identifier": "kde_accepted_lgpl_and_kfqf_accepted_gpl-56df79dc-2a6f-aa15-1384-b9638a21737f"
+      "identifier": "kde_accepted_lgpl_and_kfqf_accepted_gpl-1a159184-2296-4a31-863d-e99589aa56d6"
     }
   ],
   "other_license_expression": null,
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 d37d40f090d..891f84336bc 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_url": null,
           "matched_text": "lgpl-2.1-only AND lgpl-3.0-only AND gpl-3.0-only AND qt-gpl-exception-1.0"
         }
       ],
-      "identifier": "lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-dea14820-32f9-5c3a-4d00-8f36426fac8e"
+      "identifier": "lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-f71c2169-023a-ec07-d25a-1a0a6ae6fc4f"
     }
   ],
   "other_license_expression": null,
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 05ca02956d9..ef1aa01bb13 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
@@ -30,22 +30,22 @@
       "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",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 26,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-plus AND gpl-2.0-77bf3be68b89b9db5231f68196e7824e08107db0",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1_plus_and_gpl_2_0-77bf3be68b89b9db5231f68196e7824e08107db0",
           "rule_url": null,
           "matched_text": "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"
         }
       ],
-      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1_plus_and_gpl_2_0-4e62689a-dfcc-b2b8-c454-2173d7f86152"
+      "identifier": "gpl_2_0_plus_and__gpl_2_0_or_gpl_3_0__and_lgpl_2_1_plus_and_gpl_2_0-c5e6e317-d02f-210c-77df-e35256065657"
     }
   ],
   "other_license_expression": null,
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 f360ee94833..e2fb61ba016 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "public-domain",
-          "spdx_license_expression": "LicenseRef-scancode-public-domain",
-          "rule_identifier": "spdx-license-identifier-public-domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-public_domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_url": null,
           "matched_text": "licenseref-scancode-public-domain"
         }
       ],
-      "identifier": "public_domain-5a0148d7-0124-d104-8168-e464a488f454"
+      "identifier": "public_domain-d4ddee47-afa0-e133-44e4-f06937fd663d"
     }
   ],
   "other_license_expression": null,
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 0641c821229..a5cbd8ee88e 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-public-domain",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "public-domain",
+          "spdx_license_expression": "LicenseRef-scancode-public-domain",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 4,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "public-domain",
-          "spdx_license_expression": "LicenseRef-scancode-public-domain",
-          "rule_identifier": "spdx-license-identifier-public-domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-public_domain-3557a117ec0598b8a9056c438400584fec0415e6",
           "rule_url": null,
           "matched_text": "licenseref-scancode-public-domain"
         }
       ],
-      "identifier": "public_domain-5a0148d7-0124-d104-8168-e464a488f454"
+      "identifier": "public_domain-d4ddee47-afa0-e133-44e4-f06937fd663d"
     }
   ],
   "other_license_expression": null,
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 2c014e33926..311afeb1f2d 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference AND ISC",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference AND isc",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference AND ISC",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "unknown-license-reference AND isc",
-          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference AND ISC",
-          "rule_identifier": "spdx-license-identifier-unknown-license-reference AND isc-931c1a1fdf45228cefb05b09f05449a73fc24287",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-unknown_license_reference_and_isc-931c1a1fdf45228cefb05b09f05449a73fc24287",
           "rule_url": null,
           "matched_text": "licenseref-scancode-unknown-license-reference AND isc"
         }
       ],
-      "identifier": "unknown_license_reference_and_isc-237b1876-104e-30cf-c47f-fcf46ac41130"
+      "identifier": "unknown_license_reference_and_isc-61129f5a-ee34-d370-e8c0-7a9b7c0679db"
     }
   ],
   "other_license_expression": null,
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 2db349db8d4..1f2994a3869 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
@@ -30,22 +30,22 @@
       "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",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 36,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-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-4c618cc2365d2d36360f002752b2a7dfb8e338a4",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-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-4c618cc2365d2d36360f002752b2a7dfb8e338a4",
           "rule_url": null,
           "matched_text": "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"
         }
       ],
-      "identifier": "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-bf8f1c95-7f51-85e4-e3ef-f3b4dcaa3167"
+      "identifier": "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-38707577-6108-2177-785a-5ee2baa61419"
     }
   ],
   "other_license_expression": null,
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 9901f9e492b..0ad3a3a7322 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-1.0-or-later AND MIT AND LGPL-2.0-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 13,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-1.0-plus AND mit AND lgpl-2.0-plus-08bcf9f42fc4cda4bfb36c1191bb03b3121a3b3f",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_1_0_plus_and_mit_and_lgpl_2_0_plus-08bcf9f42fc4cda4bfb36c1191bb03b3121a3b3f",
           "rule_url": null,
           "matched_text": "gpl-1.0-or-later AND mit AND lgpl-2.0-or-later"
         }
       ],
-      "identifier": "gpl_1_0_plus_and_mit_and_lgpl_2_0_plus-c7593121-0301-6f77-03fd-e8c92d96e388"
+      "identifier": "gpl_1_0_plus_and_mit_and_lgpl_2_0_plus-5eae61c6-0606-8a4a-8ef4-045850bbace3"
     }
   ],
   "other_license_expression": null,
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 7c0a7880a29..9274cb21757 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "unknown-license-reference",
-          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "spdx-license-identifier-unknown-license-reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-unknown_license_reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_url": null,
           "matched_text": "licenseref-scancode-unknown-license-reference"
         }
       ],
-      "identifier": "unknown_license_reference-c96a9bc7-af3a-ff3f-fb67-793f7201aab1"
+      "identifier": "unknown_license_reference-50b9bf54-338e-5bf6-ccb9-ac71fdc12e10"
     }
   ],
   "other_license_expression": null,
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 783d1f29a56..fa3c3842c0b 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
@@ -30,22 +30,22 @@
       "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",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 31,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-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-64f2ebe21c0b7e185e837ac00b9ccd756d3654c7",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-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-64f2ebe21c0b7e185e837ac00b9ccd756d3654c7",
           "rule_url": null,
           "matched_text": "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"
         }
       ],
-      "identifier": "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-794ab1db-6ec6-97c2-0a9a-527e8ce2af60"
+      "identifier": "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-1c56b883-174b-da11-d6b5-f4ad4d12513e"
     }
   ],
   "other_license_expression": null,
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 bde2ecf8d30..2762ec76ed9 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-1.0-or-later AND LGPL-2.0-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-1.0-plus AND lgpl-2.0-plus-6ea1d8adc0d312a579c952366c5f2ceea876266b",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_1_0_plus_and_lgpl_2_0_plus-6ea1d8adc0d312a579c952366c5f2ceea876266b",
           "rule_url": null,
           "matched_text": "gpl-1.0-or-later AND lgpl-2.0-or-later"
         }
       ],
-      "identifier": "gpl_1_0_plus_and_lgpl_2_0_plus-4881adb3-8c7f-2d77-2d3c-7fda7fbcf5e9"
+      "identifier": "gpl_1_0_plus_and_lgpl_2_0_plus-6e5bcf7c-52d6-7330-b9f7-3ecd725c737d"
     }
   ],
   "other_license_expression": null,
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 f9161018e65..d231e218466 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 20,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-b369424d9cea52ba4d1953c9bcf424cc48586aee",
           "rule_url": null,
           "matched_text": "lgpl-2.1-only AND lgpl-3.0-only AND gpl-3.0-only AND qt-gpl-exception-1.0"
         }
       ],
-      "identifier": "lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-dea14820-32f9-5c3a-4d00-8f36426fac8e"
+      "identifier": "lgpl_2_1_and_lgpl_3_0_and_gpl_3_0_and_qt_gpl_exception_1_0-f71c2169-023a-ec07-d25a-1a0a6ae6fc4f"
     }
   ],
   "other_license_expression": null,
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 0e40cb758f2..1d0abb6963c 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later",
       "matches": [
         {
-          "score": 100.0,
+          "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",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 11,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "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",
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus AND lgpl-2.1-plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus_and_lgpl_2_1_plus-b7337f560557d7048adf521ddbfda4608795b9a0",
           "rule_url": null,
           "matched_text": "gpl-2.0-or-later AND lgpl-2.1-or-later"
         }
       ],
-      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-4e8606b0-51c5-4a74-8e25-cdd2d1a57b32"
+      "identifier": "gpl_2_0_plus_and_lgpl_2_1_plus-677d1fb8-7806-aa9e-d8da-efb0aa8f47e7"
     }
   ],
   "other_license_expression": null,
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 f6a1b53a2fe..765d1e7977f 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "MIT AND ICU AND Unicode-TOU",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "mit AND x11 AND unicode-tou",
+          "spdx_license_expression": "MIT AND ICU AND Unicode-TOU",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 6,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "mit AND x11 AND unicode-tou",
-          "spdx_license_expression": "MIT AND ICU AND Unicode-TOU",
-          "rule_identifier": "spdx-license-identifier-mit AND x11 AND unicode-tou-04c03ffc5d87121ab71914d00034fdd4a46eb02c",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-mit_and_x11_and_unicode_tou-04c03ffc5d87121ab71914d00034fdd4a46eb02c",
           "rule_url": null,
           "matched_text": "mit AND icu AND unicode-tou"
         }
       ],
-      "identifier": "mit_and_x11_and_unicode_tou-d166582e-6bb1-c449-6145-b9d5a08a23df"
+      "identifier": "mit_and_x11_and_unicode_tou-93872a25-23c6-76dd-5410-3218dc1ec059"
     }
   ],
   "other_license_expression": null,
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 35d9a482b7c..b6b5c7f659e 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "Ruby AND BSD-2-Clause AND MIT",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "ruby AND bsd-simplified AND mit",
+          "spdx_license_expression": "Ruby AND BSD-2-Clause AND MIT",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 7,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "ruby AND bsd-simplified AND mit",
-          "spdx_license_expression": "Ruby AND BSD-2-Clause AND MIT",
-          "rule_identifier": "spdx-license-identifier-ruby AND bsd-simplified AND mit-41ebb50cee7db0cae90eea02dcf774f353e5566e",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-ruby_and_bsd_simplified_and_mit-41ebb50cee7db0cae90eea02dcf774f353e5566e",
           "rule_url": null,
           "matched_text": "ruby AND bsd-2-clause AND mit"
         }
       ],
-      "identifier": "ruby_and_bsd_simplified_and_mit-51044b18-d59b-bf75-33d1-1915e63eba54"
+      "identifier": "ruby_and_bsd_simplified_and_mit-a1641df0-0337-1529-a352-1e66972a1551"
     }
   ],
   "other_license_expression": null,
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 c6122f1eb39..65f59643913 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "unknown-license-reference",
+          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "unknown-license-reference",
-          "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-          "rule_identifier": "spdx-license-identifier-unknown-license-reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-unknown_license_reference-555dc1c4c5d6d483173bdc629017bd81905d82ab",
           "rule_url": null,
           "matched_text": "licenseref-scancode-unknown-license-reference"
         }
       ],
-      "identifier": "unknown_license_reference-c96a9bc7-af3a-ff3f-fb67-793f7201aab1"
+      "identifier": "unknown_license_reference-50b9bf54-338e-5bf6-ccb9-ac71fdc12e10"
     }
   ],
   "other_license_expression": null,
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 33e2cc4cf8d..e24105a0505 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
@@ -30,22 +30,22 @@
       "license_expression_spdx": "GPL-1.0-or-later OR Artistic-1.0-Perl",
       "matches": [
         {
-          "score": 100.0,
+          "license_expression": "gpl-1.0-plus OR artistic-perl-1.0",
+          "spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0-Perl",
+          "from_file": null,
           "start_line": 1,
           "end_line": 1,
-          "from_file": null,
+          "matcher": "1-spdx-id",
+          "score": 100.0,
           "matched_length": 10,
           "match_coverage": 100.0,
-          "matcher": "1-spdx-id",
-          "license_expression": "gpl-1.0-plus OR artistic-perl-1.0",
-          "spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0-Perl",
-          "rule_identifier": "spdx-license-identifier-gpl-1.0-plus OR artistic-perl-1.0-535d84b5d1aa6e65995199385dd4e21954d8d8ba",
           "rule_relevance": 100,
+          "rule_identifier": "spdx-license-identifier-gpl_1_0_plus_or_artistic_perl_1_0-535d84b5d1aa6e65995199385dd4e21954d8d8ba",
           "rule_url": null,
           "matched_text": "gpl-1.0-or-later OR artistic-1.0-perl"
         }
       ],
-      "identifier": "gpl_1_0_plus_or_artistic_perl_1_0-5b18e6f8-26f2-64b3-9bbb-03e93b71de62"
+      "identifier": "gpl_1_0_plus_or_artistic_perl_1_0-e8b8391b-a631-ad82-c771-fb65500b961e"
     }
   ],
   "other_license_expression": null,
diff --git a/tests/packagedcode/data/alpine/full-installed/installed-expected.json b/tests/packagedcode/data/alpine/full-installed/installed-expected.json
index b54c7dbc6d7..39d8f9aa16f 100644
--- a/tests/packagedcode/data/alpine/full-installed/installed-expected.json
+++ b/tests/packagedcode/data/alpine/full-installed/installed-expected.json
@@ -41,17 +41,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -137,17 +137,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -278,17 +278,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -599,17 +599,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -857,22 +857,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1043,22 +1043,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1139,22 +1139,22 @@
         "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 9,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mpl-2.0 AND gpl-2.0-plus",
-            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
-            "rule_identifier": "spdx-license-identifier-mpl-2.0 AND gpl-2.0-plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mpl_2_0_and_gpl_2_0_plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_url": null,
             "matched_text": "mpl-2.0 AND gpl-2.0-or-later"
           }
         ],
-        "identifier": "mpl_2_0_and_gpl_2_0_plus-fb163695-8575-68e5-0fd0-cd41328bb5a5"
+        "identifier": "mpl_2_0_and_gpl_2_0_plus-3c1af8bd-e4f9-ffcc-1ea3-9dcc9fab99ef"
       }
     ],
     "other_license_expression": null,
@@ -1227,17 +1227,17 @@
         "license_expression_spdx": "ISC",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "isc",
+            "spdx_license_expression": "ISC",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "isc",
-            "spdx_license_expression": "ISC",
-            "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_url": null,
             "matched_text": "isc"
           }
@@ -1334,17 +1334,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1421,17 +1421,17 @@
         "license_expression_spdx": "Zlib",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "zlib",
-            "spdx_license_expression": "Zlib",
-            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_url": null,
             "matched_text": "zlib"
           }
@@ -1517,17 +1517,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1604,17 +1604,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1691,22 +1691,22 @@
         "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "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",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 11,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "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",
-            "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_url": null,
             "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
           }
         ],
-        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
       }
     ],
     "other_license_expression": null,
@@ -1825,22 +1825,22 @@
         "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "bsd-simplified AND bsd-new",
+            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 7,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "bsd-simplified AND bsd-new",
-            "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-            "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
             "rule_url": null,
             "matched_text": "bsd-2-clause AND bsd-3-clause"
           }
         ],
-        "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+        "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
       }
     ],
     "other_license_expression": null,
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 d170fa7c5c9..cdbc776419c 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
@@ -42,17 +42,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -135,17 +135,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -228,17 +228,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -348,17 +348,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -603,22 +603,22 @@
           "license_expression_spdx": "MPL-2.0 AND MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0 AND mit",
+              "spdx_license_expression": "MPL-2.0 AND MIT",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mpl-2.0 AND mit",
-              "spdx_license_expression": "MPL-2.0 AND MIT",
-              "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mpl_2_0_and_mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
               "rule_url": null,
               "matched_text": "mpl-2.0 AND mit"
             }
           ],
-          "identifier": "mpl_2_0_and_mit-988cb9df-c9be-c91d-c7e4-896f96e84eb8"
+          "identifier": "mpl_2_0_and_mit-0ec4a3d2-4f7b-39d7-f14f-8bb7666de6d5"
         }
       ],
       "other_license_expression": null,
@@ -696,22 +696,22 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_url": null,
               "matched_text": "openssl"
             }
           ],
-          "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+          "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
         }
       ],
       "other_license_expression": null,
@@ -816,22 +816,22 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
               "rule_url": null,
               "matched_text": "openssl"
             }
           ],
-          "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+          "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
         }
       ],
       "other_license_expression": null,
@@ -909,22 +909,22 @@
           "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "isc AND (bsd-new OR mit)",
+              "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "isc AND (bsd-new OR mit)",
-              "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
-              "rule_identifier": "spdx-license-identifier-isc AND (bsd-new OR mit)-7471dfe24fdc3b7a8943273ac320469f644d2688",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-isc_and__bsd_new_or_mit-7471dfe24fdc3b7a8943273ac320469f644d2688",
               "rule_url": null,
               "matched_text": "isc AND (bsd-3-clause OR mit)"
             }
           ],
-          "identifier": "isc_and__bsd_new_or_mit-d4c1876e-a168-ee43-975a-1df35f85f171"
+          "identifier": "isc_and__bsd_new_or_mit-00412b1c-2d3c-5fef-ddd7-9c04aca09dd5"
         }
       ],
       "other_license_expression": null,
@@ -1002,17 +1002,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1083,17 +1083,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
               "rule_url": null,
               "matched_text": "zlib"
             }
@@ -1176,17 +1176,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1257,17 +1257,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
               "matched_text": "gpl-2.0-only"
             }
@@ -1338,22 +1338,22 @@
           "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 11,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
               "rule_url": null,
               "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
             }
           ],
-          "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+          "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
         }
       ],
       "other_license_expression": null,
@@ -1419,22 +1419,22 @@
           "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-simplified AND bsd-new",
+              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+              "from_file": "alpine-rootfs/lib/apk/db/installed",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alpine-rootfs/lib/apk/db/installed",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "bsd-simplified AND bsd-new",
-              "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-              "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
               "rule_url": null,
               "matched_text": "bsd-2-clause AND bsd-3-clause"
             }
           ],
-          "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+          "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
         }
       ],
       "other_license_expression": null,
@@ -2203,17 +2203,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -2299,17 +2299,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -2440,17 +2440,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -2770,17 +2770,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -3217,22 +3217,22 @@
               "license_expression_spdx": "MPL-2.0 AND MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0 AND mit",
+                  "spdx_license_expression": "MPL-2.0 AND MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mpl-2.0 AND mit",
-                  "spdx_license_expression": "MPL-2.0 AND MIT",
-                  "rule_identifier": "spdx-license-identifier-mpl-2.0 AND mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mpl_2_0_and_mit-5514313e881fb20dc746d1ac1e3a53a643c808d7",
                   "rule_url": null,
                   "matched_text": "mpl-2.0 AND mit"
                 }
               ],
-              "identifier": "mpl_2_0_and_mit-988cb9df-c9be-c91d-c7e4-896f96e84eb8"
+              "identifier": "mpl_2_0_and_mit-0ec4a3d2-4f7b-39d7-f14f-8bb7666de6d5"
             }
           ],
           "other_license_expression": null,
@@ -3313,22 +3313,22 @@
               "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "openssl-ssleay",
-                  "spdx_license_expression": "OpenSSL",
-                  "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_url": null,
                   "matched_text": "openssl"
                 }
               ],
-              "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+              "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
             }
           ],
           "other_license_expression": null,
@@ -3490,22 +3490,22 @@
               "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "openssl-ssleay",
-                  "spdx_license_expression": "OpenSSL",
-                  "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
                   "rule_url": null,
                   "matched_text": "openssl"
                 }
               ],
-              "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+              "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
             }
           ],
           "other_license_expression": null,
@@ -3586,22 +3586,22 @@
               "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "isc AND (bsd-new OR mit)",
+                  "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "isc AND (bsd-new OR mit)",
-                  "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
-                  "rule_identifier": "spdx-license-identifier-isc AND (bsd-new OR mit)-7471dfe24fdc3b7a8943273ac320469f644d2688",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-isc_and__bsd_new_or_mit-7471dfe24fdc3b7a8943273ac320469f644d2688",
                   "rule_url": null,
                   "matched_text": "isc AND (bsd-3-clause OR mit)"
                 }
               ],
-              "identifier": "isc_and__bsd_new_or_mit-d4c1876e-a168-ee43-975a-1df35f85f171"
+              "identifier": "isc_and__bsd_new_or_mit-00412b1c-2d3c-5fef-ddd7-9c04aca09dd5"
             }
           ],
           "other_license_expression": null,
@@ -3693,17 +3693,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -3780,17 +3780,17 @@
               "license_expression_spdx": "Zlib",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
                   "rule_url": null,
                   "matched_text": "zlib"
                 }
@@ -3876,17 +3876,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -3993,17 +3993,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
                   "matched_text": "gpl-2.0-only"
                 }
@@ -4080,22 +4080,22 @@
               "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "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",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 11,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "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",
-                  "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
                   "rule_url": null,
                   "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
                 }
               ],
-              "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+              "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
             }
           ],
           "other_license_expression": null,
@@ -4214,22 +4214,22 @@
               "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-simplified AND bsd-new",
+                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "bsd-simplified AND bsd-new",
-                  "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-                  "rule_identifier": "spdx-license-identifier-bsd-simplified AND bsd-new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-bsd_simplified_and_bsd_new-dc707a661bb1da34ff773b7e9955e0235b3b3f74",
                   "rule_url": null,
                   "matched_text": "bsd-2-clause AND bsd-3-clause"
                 }
               ],
-              "identifier": "bsd_simplified_and_bsd_new-73e0acf3-001a-667e-f37b-135c6b8a5cad"
+              "identifier": "bsd_simplified_and_bsd_new-571c460d-b906-8e23-30cd-5429d912eee3"
             }
           ],
           "other_license_expression": null,
diff --git a/tests/packagedcode/data/alpine/small-installed/installed-expected.json b/tests/packagedcode/data/alpine/small-installed/installed-expected.json
index b9322ba2823..ad245604036 100644
--- a/tests/packagedcode/data/alpine/small-installed/installed-expected.json
+++ b/tests/packagedcode/data/alpine/small-installed/installed-expected.json
@@ -41,17 +41,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -137,17 +137,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -278,17 +278,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -599,17 +599,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url": null,
             "matched_text": "mit"
           }
@@ -839,22 +839,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1025,22 +1025,22 @@
         "license_expression_spdx": "OpenSSL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "openssl-ssleay",
+            "spdx_license_expression": "OpenSSL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "openssl-ssleay",
-            "spdx_license_expression": "OpenSSL",
-            "rule_identifier": "spdx-license-identifier-openssl-ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-openssl_ssleay-b5dd48b21e3399670d584d4ade9a9791a24c58cd",
             "rule_url": null,
             "matched_text": "openssl"
           }
         ],
-        "identifier": "openssl_ssleay-5eedc4a6-a77c-b373-2ac4-55bb8c004773"
+        "identifier": "openssl_ssleay-602fb366-4d56-7dcd-cac5-129d99473599"
       }
     ],
     "other_license_expression": null,
@@ -1121,22 +1121,22 @@
         "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mpl-2.0 AND gpl-2.0-plus",
+            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 9,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mpl-2.0 AND gpl-2.0-plus",
-            "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later",
-            "rule_identifier": "spdx-license-identifier-mpl-2.0 AND gpl-2.0-plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mpl_2_0_and_gpl_2_0_plus-ebba41d440d51e8500958cb8f2bc7302a0b7b0c5",
             "rule_url": null,
             "matched_text": "mpl-2.0 AND gpl-2.0-or-later"
           }
         ],
-        "identifier": "mpl_2_0_and_gpl_2_0_plus-fb163695-8575-68e5-0fd0-cd41328bb5a5"
+        "identifier": "mpl_2_0_and_gpl_2_0_plus-3c1af8bd-e4f9-ffcc-1ea3-9dcc9fab99ef"
       }
     ],
     "other_license_expression": null,
@@ -1200,17 +1200,17 @@
         "license_expression_spdx": "ISC",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "isc",
+            "spdx_license_expression": "ISC",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "isc",
-            "spdx_license_expression": "ISC",
-            "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-isc-fd23252ced2c9184cff91208f30a380cf105f995",
             "rule_url": null,
             "matched_text": "isc"
           }
@@ -1307,17 +1307,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1394,17 +1394,17 @@
         "license_expression_spdx": "Zlib",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "zlib",
+            "spdx_license_expression": "Zlib",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "zlib",
-            "spdx_license_expression": "Zlib",
-            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-zlib-2023583c09c2e5aa14d564036e304041c0f1ace3",
             "rule_url": null,
             "matched_text": "zlib"
           }
@@ -1490,17 +1490,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 50.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 50.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "gpl2_bare_word_only.RULE",
             "rule_relevance": 50,
+            "rule_identifier": "gpl2_bare_word_only.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl2_bare_word_only.RULE",
             "matched_text": "gpl2"
           }
@@ -1577,17 +1577,17 @@
         "license_expression_spdx": "GPL-2.0-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "gpl-2.0",
+            "spdx_license_expression": "GPL-2.0-only",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "gpl-2.0",
-            "spdx_license_expression": "GPL-2.0-only",
-            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-2.0-only_for_gpl-2.0.RULE",
             "matched_text": "gpl-2.0-only"
           }
@@ -1664,22 +1664,22 @@
         "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "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",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 11,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "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",
-            "rule_identifier": "spdx-license-identifier-mit AND bsd-new AND gpl-2.0-plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit_and_bsd_new_and_gpl_2_0_plus-a42688b31c355df3bef97265e8ca20360250716e",
             "rule_url": null,
             "matched_text": "mit AND bsd-3-clause AND gpl-2.0-or-later"
           }
         ],
-        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-57deb96b-d294-ad77-12c0-3e0e3c5d55f3"
+        "identifier": "mit_and_bsd_new_and_gpl_2_0_plus-f5dc1480-e57f-fd40-8614-8d2a83cd4bb9"
       }
     ],
     "other_license_expression": null,
@@ -1798,17 +1798,17 @@
         "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 3,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "bsd-new",
-            "spdx_license_expression": "BSD-3-Clause",
-            "rule_identifier": "bsd-new_10.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "bsd-new_10.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
             "matched_text": "bsd-3-clause"
           }
diff --git a/tests/packagedcode/data/npm/chartist/package.json.expected b/tests/packagedcode/data/npm/chartist/package.json.expected
index dffea3c9a4b..db8b4ea571f 100644
--- a/tests/packagedcode/data/npm/chartist/package.json.expected
+++ b/tests/packagedcode/data/npm/chartist/package.json.expected
@@ -44,39 +44,39 @@
         "license_expression_spdx": "MIT OR WTFPL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit OR wtfpl-2.0",
+            "spdx_license_expression": "MIT OR WTFPL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 3,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit OR wtfpl-2.0",
-            "spdx_license_expression": "MIT OR WTFPL",
-            "rule_identifier": "spdx-license-identifier-mit OR wtfpl-2.0-a3a16f7e12d6ecec29951dd1a41d0d4dbd91e112",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit_or_wtfpl_2_0-a3a16f7e12d6ecec29951dd1a41d0d4dbd91e112",
             "rule_url": null,
             "matched_text": "MIT OR WTFPL"
           }
         ],
-        "identifier": "mit_or_wtfpl_2_0-35db8598-e6f1-f9c5-6a74-5ccca257c5e7"
+        "identifier": "mit_or_wtfpl_2_0-6e79a0d6-24d4-17b2-ba10-09867c90eb5b"
       },
       {
         "license_expression": "wtfpl-2.0",
         "license_expression_spdx": "WTFPL",
         "matches": [
           {
-            "score": 50.0,
+            "license_expression": "wtfpl-2.0",
+            "spdx_license_expression": "WTFPL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 50.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "wtfpl-2.0",
-            "spdx_license_expression": "WTFPL",
-            "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
             "rule_relevance": 50,
+            "rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
             "matched_text": "WTFPL"
           }
@@ -88,17 +88,17 @@
         "license_expression_spdx": "WTFPL",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "wtfpl-2.0",
+            "spdx_license_expression": "WTFPL",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 2,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "wtfpl-2.0",
-            "spdx_license_expression": "WTFPL",
-            "rule_identifier": "wtfpl-2.0_33.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "wtfpl-2.0_33.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_33.RULE",
             "matched_text": "https://github.com/gionkunz/chartist-js/blob/master/LICENSE-WTFPL"
           }
@@ -110,17 +110,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 1,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
             "rule_url": null,
             "matched_text": "MIT"
           }
@@ -132,17 +132,17 @@
         "license_expression_spdx": "MIT",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "mit",
+            "spdx_license_expression": "MIT",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 2,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "mit",
-            "spdx_license_expression": "MIT",
-            "rule_identifier": "mit_30.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "mit_30.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
             "matched_text": "https://github.com/gionkunz/chartist-js/blob/master/LICENSE-MIT"
           }
diff --git a/tests/packagedcode/data/opam/sample4/output.opam.expected b/tests/packagedcode/data/opam/sample4/output.opam.expected
index 571edecb3aa..83ab49318d7 100644
--- a/tests/packagedcode/data/opam/sample4/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample4/output.opam.expected
@@ -53,22 +53,22 @@
         "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 9,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
-            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
-            "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-lgpl_3_0_with_ocaml_lgpl_linking_exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_url": null,
             "matched_text": "LGPL-3.0-only with OCaml-LGPL-linking-exception"
           }
         ],
-        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-cfc152e7-89df-f8e0-0d25-d5b45a077913"
+        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-d5f22af5-e434-a5f7-9f3a-097820a7004f"
       }
     ],
     "other_license_expression": null,
diff --git a/tests/packagedcode/data/opam/sample7/output.opam.expected b/tests/packagedcode/data/opam/sample7/output.opam.expected
index 06f4faa1f4d..1428161c1ec 100644
--- a/tests/packagedcode/data/opam/sample7/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample7/output.opam.expected
@@ -53,22 +53,22 @@
         "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 9,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
-            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
-            "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-lgpl_3_0_with_ocaml_lgpl_linking_exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_url": null,
             "matched_text": "LGPL-3.0-only with OCaml-LGPL-linking-exception"
           }
         ],
-        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-cfc152e7-89df-f8e0-0d25-d5b45a077913"
+        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-d5f22af5-e434-a5f7-9f3a-097820a7004f"
       }
     ],
     "other_license_expression": null,
diff --git a/tests/packagedcode/data/opam/sample8/output.opam.expected b/tests/packagedcode/data/opam/sample8/output.opam.expected
index 571edecb3aa..83ab49318d7 100644
--- a/tests/packagedcode/data/opam/sample8/output.opam.expected
+++ b/tests/packagedcode/data/opam/sample8/output.opam.expected
@@ -53,22 +53,22 @@
         "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
+            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 9,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception",
-            "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception",
-            "rule_identifier": "spdx-license-identifier-lgpl-3.0 WITH ocaml-lgpl-linking-exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-lgpl_3_0_with_ocaml_lgpl_linking_exception-45b28dafe2d3f59c703b2663cd62d139586477a0",
             "rule_url": null,
             "matched_text": "LGPL-3.0-only with OCaml-LGPL-linking-exception"
           }
         ],
-        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-cfc152e7-89df-f8e0-0d25-d5b45a077913"
+        "identifier": "lgpl_3_0_with_ocaml_lgpl_linking_exception-d5f22af5-e434-a5f7-9f3a-097820a7004f"
       }
     ],
     "other_license_expression": null,
diff --git a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
index 8300a54d755..a6c6322bd3b 100644
--- a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected
@@ -46,22 +46,22 @@
         "license_expression_spdx": "LGPL-2.1-only OR GPL-3.0-or-later",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1 OR gpl-3.0-plus",
+            "spdx_license_expression": "LGPL-2.1-only OR GPL-3.0-or-later",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 10,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "license_expression": "lgpl-2.1 OR gpl-3.0-plus",
-            "spdx_license_expression": "LGPL-2.1-only OR GPL-3.0-or-later",
-            "rule_identifier": "spdx-license-identifier-lgpl-2.1 OR gpl-3.0-plus-4447537ab02d07e1156b062adaf7b9e2ba3f55de",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-lgpl_2_1_or_gpl_3_0_plus-4447537ab02d07e1156b062adaf7b9e2ba3f55de",
             "rule_url": null,
             "matched_text": "(LGPL-2.1-only or GPL-3.0-or-later)"
           }
         ],
-        "identifier": "lgpl_2_1_or_gpl_3_0_plus-ffc36bf4-cf08-e140-bdd7-23139c43d6ea"
+        "identifier": "lgpl_2_1_or_gpl_3_0_plus-e395cb31-2a86-daaf-3644-602517008219"
       }
     ],
     "other_license_expression": null,
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 8b905296cc0..ae7ba94fa53 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
@@ -59,22 +59,22 @@
         "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
         "matches": [
           {
-            "score": 100.0,
+            "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",
+            "from_file": null,
             "start_line": 1,
             "end_line": 1,
-            "from_file": null,
+            "matcher": "1-spdx-id",
+            "score": 100.0,
             "matched_length": 18,
             "match_coverage": 100.0,
-            "matcher": "1-spdx-id",
-            "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",
-            "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
             "rule_relevance": 100,
+            "rule_identifier": "spdx-license-identifier-apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
             "rule_url": null,
             "matched_text": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft"
           }
         ],
-        "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-b684b1e7-0568-cb99-16b9-e4b66bbf5120"
+        "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-22959186-4062-af61-0401-671dffe8beea"
       }
     ],
     "other_license_expression": null,
diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json
index 4f2d3dd077e..e6f1639ec54 100644
--- a/tests/packagedcode/data/pypi/solo-metadata/expected.json
+++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json
@@ -67,22 +67,22 @@
           "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
           "matches": [
             {
-              "score": 100.0,
+              "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",
+              "from_file": "PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "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",
-              "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
               "rule_url": null,
               "matched_text": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft"
             }
           ],
-          "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-b684b1e7-0568-cb99-16b9-e4b66bbf5120"
+          "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-22959186-4062-af61-0401-671dffe8beea"
         }
       ],
       "other_license_expression": null,
@@ -178,22 +178,22 @@
               "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft",
               "matches": [
                 {
-                  "score": 100.0,
+                  "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",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "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",
-                  "rule_identifier": "spdx-license-identifier-apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-c7657a2c18db6a7df47030f236ebed3021446a79",
                   "rule_url": null,
                   "matched_text": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft"
                 }
               ],
-              "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-b684b1e7-0568-cb99-16b9-e4b66bbf5120"
+              "identifier": "apache_2_0_and_cc_by_4_0_and_other_permissive_and_other_copyleft-22959186-4062-af61-0401-671dffe8beea"
             }
           ],
           "other_license_expression": null,
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 fa27a7a2c65..12c70eb6244 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
@@ -34,17 +34,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -306,17 +306,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -416,17 +416,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -487,17 +487,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -17211,47 +17211,47 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             }
@@ -17312,47 +17312,47 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             }
@@ -17830,17 +17830,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -18849,17 +18849,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -18968,17 +18968,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_24.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_24.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_24.RULE",
               "matched_text": "license zlib and Boost"
             }
@@ -19078,17 +19078,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -19149,17 +19149,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -19448,17 +19448,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -19531,17 +19531,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
               "matched_text": "GPLv2"
             }
@@ -19668,17 +19668,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -19751,17 +19751,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -20140,32 +20140,32 @@
           "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+ or GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv3+ or GPLv2+"
             }
@@ -20265,17 +20265,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
               "matched_text": "GPLv2"
             }
@@ -21131,32 +21131,32 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLV2+ or LGPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "GPLV2+ or LGPLv3+"
             }
@@ -21265,32 +21265,32 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+ or LGPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "GPLv2+ or LGPLv3+"
             }
@@ -21426,17 +21426,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -21518,17 +21518,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -22024,17 +22024,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -22125,17 +22125,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -22208,17 +22208,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -22363,32 +22363,32 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and GPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "LGPLv2+ and GPLv3+"
             }
@@ -22524,17 +22524,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -22616,17 +22616,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+ and BSD"
             }
@@ -22717,17 +22717,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -22827,17 +22827,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -22898,22 +22898,22 @@
           "license_expression_spdx": "OpenSSL",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "openssl-ssleay",
+              "spdx_license_expression": "OpenSSL",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "openssl-ssleay",
-              "spdx_license_expression": "OpenSSL",
-              "rule_identifier": "spdx-license-identifier-openssl-ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-openssl_ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
               "rule_url": null,
               "matched_text": "OpenSSL"
             }
           ],
-          "identifier": "openssl_ssleay-24502a74-d43d-88be-d77b-ff594c818ddd"
+          "identifier": "openssl_ssleay-84d820dd-f1ab-1bf0-0c65-5743d8ae36f1"
         }
       ],
       "other_license_expression": null,
@@ -23008,17 +23008,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -23109,32 +23109,32 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+, LGPLv2+, MIT"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv2+, LGPLv2+, MIT"
             }
@@ -23207,17 +23207,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -23290,17 +23290,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -23796,17 +23796,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "BSD or GPLv2+"
             }
@@ -24365,32 +24365,32 @@
           "license_expression_spdx": "LGPL-3.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+ and GPLv3+ and GFDL"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "LGPLv3+ and GPLv3+ and GFDL"
             }
@@ -24526,32 +24526,32 @@
           "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and LGPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv3+ and LGPLv2+"
             }
@@ -24804,47 +24804,47 @@
           "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
             }
@@ -24980,17 +24980,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -25108,17 +25108,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -25245,17 +25245,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -25544,17 +25544,17 @@
           "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+"
             }
@@ -25627,17 +25627,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "MIT or LGPLv2+ or BSD"
             }
@@ -25746,17 +25746,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "BSD and GPLv2+"
             }
@@ -28700,17 +28700,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+"
             }
@@ -28819,32 +28819,32 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+ and LGPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv2+ and LGPLv2+"
             }
@@ -28926,17 +28926,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+"
             }
@@ -29054,17 +29054,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -29272,17 +29272,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "5-undetected",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "5-undetected",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
               "rule_relevance": 100,
+              "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
               "matched_text": "license OpenLDAP"
             }
@@ -29436,17 +29436,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -29519,17 +29519,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+"
             }
@@ -29602,17 +29602,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+"
             }
@@ -30459,62 +30459,62 @@
           "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
             }
@@ -30587,17 +30587,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -30742,17 +30742,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -30852,17 +30852,17 @@
           "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+"
             }
@@ -31014,17 +31014,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "5-undetected",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "5-undetected",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "rule_relevance": 100,
+              "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "matched_text": "license pubkey"
             }
@@ -31085,62 +31085,62 @@
           "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
             }
@@ -31222,17 +31222,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -31395,17 +31395,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -185243,17 +185243,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -185314,17 +185314,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -185406,47 +185406,47 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             }
@@ -185555,17 +185555,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -185809,17 +185809,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -185880,17 +185880,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -185963,17 +185963,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -186082,17 +186082,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -186153,17 +186153,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -186245,17 +186245,17 @@
           "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0",
-              "spdx_license_expression": "LGPL-2.0-only",
-              "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
               "matched_text": "BSD and LGPLv2 and Sleepycat"
             }
@@ -186346,47 +186346,47 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
             }
@@ -186486,17 +186486,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -186569,17 +186569,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -186670,17 +186670,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -186834,17 +186834,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -187412,47 +187412,47 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
             }
@@ -187579,17 +187579,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -187662,17 +187662,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -187745,17 +187745,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -187909,17 +187909,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -187992,17 +187992,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -189092,17 +189092,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -189211,17 +189211,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -189366,17 +189366,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -189485,17 +189485,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -189586,32 +189586,32 @@
           "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and LGPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv3+ and LGPLv2+"
             }
@@ -189729,17 +189729,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "Public Domain"
             }
@@ -189875,17 +189875,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -189994,17 +189994,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+ and MIT"
             }
@@ -190086,17 +190086,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -190844,17 +190844,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and GFDL"
             }
@@ -191089,17 +191089,17 @@
           "license_expression_spdx": "GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "BSD and GPLv2+"
             }
@@ -193782,17 +193782,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -193865,32 +193865,32 @@
           "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+ or GPLv2+"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "LGPLv3+ or GPLv2+"
             }
@@ -194026,17 +194026,17 @@
           "license_expression_spdx": "LGPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0",
+              "spdx_license_expression": "LGPL-2.0-only",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0",
-              "spdx_license_expression": "LGPL-2.0-only",
-              "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0_35.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
               "matched_text": "BSD and LGPLv2 and Sleepycat"
             }
@@ -194235,17 +194235,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -194306,17 +194306,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "5-undetected",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "5-undetected",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
               "rule_relevance": 100,
+              "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
               "matched_text": "license MPLv1.1"
             }
@@ -194377,17 +194377,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mpl-2.0_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
               "matched_text": "MPLv2.0"
             }
@@ -194469,17 +194469,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -194552,17 +194552,17 @@
           "license_expression_spdx": "LGPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-3.0-plus",
+              "spdx_license_expression": "LGPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-3.0-plus",
-              "spdx_license_expression": "LGPL-3.0-or-later",
-              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-3.0-plus_14.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
               "matched_text": "LGPLv3+"
             }
@@ -194635,17 +194635,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -194718,17 +194718,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -194819,17 +194819,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -194947,17 +194947,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -195075,47 +195075,47 @@
           "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
             }
@@ -195530,17 +195530,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD with advertising"
             }
@@ -195820,17 +195820,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -195903,17 +195903,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -196076,32 +196076,32 @@
           "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2+ and LGPLv2+ with exceptions"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv2+ and LGPLv2+ with exceptions"
             }
@@ -196210,17 +196210,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -196302,17 +196302,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -197312,17 +197312,17 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "LGPLv2+"
             }
@@ -197404,17 +197404,17 @@
           "license_expression_spdx": "GPL-3.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-3.0-plus",
+              "spdx_license_expression": "GPL-3.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-3.0-plus",
-              "spdx_license_expression": "GPL-3.0-or-later",
-              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-3.0-plus_28.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
               "matched_text": "GPLv3+"
             }
@@ -197496,62 +197496,62 @@
           "license_expression_spdx": "GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
               "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
             },
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0-plus",
+              "spdx_license_expression": "GPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-2.0-plus",
-              "spdx_license_expression": "GPL-2.0-or-later",
-              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
               "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_68.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
               "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
             },
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "rootfs/var/lib/rpm/Packages",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "rootfs/var/lib/rpm/Packages",
+              "matcher": "2-aho",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
             }
@@ -217075,17 +217075,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -217440,17 +217440,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -217796,17 +217796,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -217863,17 +217863,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -234599,47 +234599,47 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 }
@@ -234696,47 +234696,47 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 }
@@ -237674,17 +237674,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -238885,17 +238885,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -239043,17 +239043,17 @@
               "license_expression_spdx": "Zlib",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "zlib_24.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "zlib_24.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_24.RULE",
                   "matched_text": "license zlib and Boost"
                 }
@@ -239174,17 +239174,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -239287,17 +239287,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -239625,17 +239625,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -239729,17 +239729,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
                   "matched_text": "GPLv2"
                 }
@@ -239932,17 +239932,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -240045,17 +240045,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -240464,32 +240464,32 @@
               "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+"
                 }
@@ -240637,17 +240637,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
                   "matched_text": "GPLv2"
                 }
@@ -241632,32 +241632,32 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLV2+ or LGPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "GPLV2+ or LGPLv3+"
                 }
@@ -241796,32 +241796,32 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+ or LGPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "GPLv2+ or LGPLv3+"
                 }
@@ -241987,17 +241987,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -242073,17 +242073,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -242600,17 +242600,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -242704,17 +242704,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -242817,17 +242817,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -243011,32 +243011,32 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and GPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "LGPLv2+ and GPLv3+"
                 }
@@ -243202,17 +243202,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -243306,17 +243306,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+ and BSD"
                 }
@@ -243410,17 +243410,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -243550,17 +243550,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -243663,22 +243663,22 @@
               "license_expression_spdx": "OpenSSL",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "openssl-ssleay",
+                  "spdx_license_expression": "OpenSSL",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "openssl-ssleay",
-                  "spdx_license_expression": "OpenSSL",
-                  "rule_identifier": "spdx-license-identifier-openssl-ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-openssl_ssleay-03d817701afe404cc2df5eb4625e37d9869edb1e",
                   "rule_url": null,
                   "matched_text": "OpenSSL"
                 }
               ],
-              "identifier": "openssl_ssleay-24502a74-d43d-88be-d77b-ff594c818ddd"
+              "identifier": "openssl_ssleay-84d820dd-f1ab-1bf0-0c65-5743d8ae36f1"
             }
           ],
           "other_license_expression": null,
@@ -243902,17 +243902,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -244024,32 +244024,32 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+, LGPLv2+, MIT"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv2+, LGPLv2+, MIT"
                 }
@@ -244305,17 +244305,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -244418,17 +244418,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -245008,17 +245008,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "BSD or GPLv2+"
                 }
@@ -245643,32 +245643,32 @@
               "license_expression_spdx": "LGPL-3.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+ and GPLv3+ and GFDL"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "LGPLv3+ and GPLv3+ and GFDL"
                 }
@@ -245834,32 +245834,32 @@
               "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and LGPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv3+ and LGPLv2+"
                 }
@@ -246151,47 +246151,47 @@
               "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "(LGPLv3+ or GPLv2+) and GPLv3+"
                 }
@@ -246375,17 +246375,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -246551,17 +246551,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -246799,17 +246799,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -247164,17 +247164,17 @@
               "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+"
                 }
@@ -247277,17 +247277,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "MIT or LGPLv2+ or BSD"
                 }
@@ -247444,17 +247444,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "BSD and GPLv2+"
                 }
@@ -250644,17 +250644,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+"
                 }
@@ -250784,32 +250784,32 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+ and LGPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv2+ and LGPLv2+"
                 }
@@ -250912,17 +250912,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+"
                 }
@@ -251052,17 +251052,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -251489,17 +251489,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-1468f5c04ce66bed92859f134fea3273baa9ba43",
                   "matched_text": "license OpenLDAP"
                 }
@@ -251746,17 +251746,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -251850,17 +251850,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+"
                 }
@@ -251927,17 +251927,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+"
                 }
@@ -254245,62 +254245,62 @@
               "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+ or (LGPLv3+ and GPLv2+)"
                 }
@@ -254403,17 +254403,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -254588,17 +254588,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -254728,17 +254728,17 @@
               "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+"
                 }
@@ -255001,17 +255001,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "matched_text": "license pubkey"
                 }
@@ -255068,62 +255068,62 @@
               "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD"
                 }
@@ -255253,17 +255253,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -255501,17 +255501,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -410837,17 +410837,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -410941,17 +410941,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -412485,47 +412485,47 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 }
@@ -412952,17 +412952,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -413200,17 +413200,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -413295,17 +413295,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -413417,17 +413417,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -413575,17 +413575,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -413670,17 +413670,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -413765,17 +413765,17 @@
               "license_expression_spdx": "LGPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0",
+                  "spdx_license_expression": "LGPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0",
-                  "spdx_license_expression": "LGPL-2.0-only",
-                  "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
                   "matched_text": "BSD and LGPLv2 and Sleepycat"
                 }
@@ -413896,47 +413896,47 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv2+ and LGPLv2+ with exceptions and GPLv2+"
                 }
@@ -414030,17 +414030,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -414134,17 +414134,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -414256,17 +414256,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -414504,17 +414504,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -415130,47 +415130,47 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "(GPLv2+ or LGPLv3+) and GPLv3+"
                 }
@@ -415354,17 +415354,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -415449,17 +415449,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -416489,17 +416489,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -417025,17 +417025,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -417102,17 +417102,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -418394,17 +418394,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -418552,17 +418552,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -418737,17 +418737,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -418877,17 +418877,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -418981,32 +418981,32 @@
               "license_expression_spdx": "GPL-3.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and LGPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv3+ and LGPLv2+"
                 }
@@ -419154,17 +419154,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "Public Domain"
                 }
@@ -419609,17 +419609,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -419749,17 +419749,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+ and MIT"
                 }
@@ -419898,17 +419898,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -420713,17 +420713,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and GFDL"
                 }
@@ -421114,17 +421114,17 @@
               "license_expression_spdx": "GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "BSD and GPLv2+"
                 }
@@ -424611,17 +424611,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -424715,32 +424715,32 @@
               "license_expression_spdx": "LGPL-3.0-or-later AND GPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "LGPLv3+ or GPLv2+"
                 }
@@ -424960,17 +424960,17 @@
               "license_expression_spdx": "LGPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0",
+                  "spdx_license_expression": "LGPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0",
-                  "spdx_license_expression": "LGPL-2.0-only",
-                  "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0_35.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_35.RULE",
                   "matched_text": "BSD and LGPLv2 and Sleepycat"
                 }
@@ -425298,17 +425298,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -425465,17 +425465,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-13009f1da345988b791cd1c802dc90f361c90176",
                   "matched_text": "license MPLv1.1"
                 }
@@ -425560,17 +425560,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mpl-2.0_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_93.RULE",
                   "matched_text": "MPLv2.0"
                 }
@@ -425664,17 +425664,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -425777,17 +425777,17 @@
               "license_expression_spdx": "LGPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-3.0-plus",
+                  "spdx_license_expression": "LGPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-3.0-plus",
-                  "spdx_license_expression": "LGPL-3.0-or-later",
-                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-3.0-plus_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_14.RULE",
                   "matched_text": "LGPLv3+"
                 }
@@ -425890,17 +425890,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -426039,17 +426039,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -426179,17 +426179,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -426328,17 +426328,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -426477,47 +426477,47 @@
               "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv3+ and GPLv2+ and LGPLv2+ and BSD"
                 }
@@ -427358,17 +427358,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD with advertising"
                 }
@@ -427723,17 +427723,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -427827,17 +427827,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -428021,32 +428021,32 @@
               "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2+ and LGPLv2+ with exceptions"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv2+ and LGPLv2+ with exceptions"
                 }
@@ -428149,17 +428149,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -428271,17 +428271,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -429509,17 +429509,17 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "LGPLv2+"
                 }
@@ -429622,17 +429622,17 @@
               "license_expression_spdx": "GPL-3.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-3.0-plus",
+                  "spdx_license_expression": "GPL-3.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-3.0-plus",
-                  "spdx_license_expression": "GPL-3.0-or-later",
-                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-3.0-plus_28.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_28.RULE",
                   "matched_text": "GPLv3+"
                 }
@@ -429735,62 +429735,62 @@
               "license_expression_spdx": "GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
                   "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0-plus",
+                  "spdx_license_expression": "GPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-2.0-plus",
-                  "spdx_license_expression": "GPL-2.0-or-later",
-                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0-plus_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_bare_single_word.RULE",
                   "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_68.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_68.RULE",
                   "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
                 },
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": null,
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain"
                 }
diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
index e8749a7f0d9..72c47c21edf 100644
--- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
+++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -276,7 +276,7 @@
   ],
   "license_detections": [
     {
-      "identifier": "gpl_2_0_plus-1db96703-cb36-48f4-1493-265d3d85eb9e",
+      "identifier": "gpl_2_0_plus-cdfb149f-ba4a-2c30-a8a0-76aa75a6ccf5",
       "license_expression": "gpl-2.0-plus",
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
@@ -292,7 +292,7 @@
           "matched_length": 8,
           "match_coverage": 100.0,
           "rule_relevance": 100,
-          "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
+          "rule_identifier": "spdx-license-identifier-gpl_2_0_plus-d77dcfd90692f92e4c8cd586b28797e4f3d067f3",
           "rule_url": null
         }
       ]
@@ -874,11 +874,11 @@
               "matched_length": 8,
               "match_coverage": 100.0,
               "rule_relevance": 100,
-              "rule_identifier": "spdx-license-identifier-gpl-2.0-plus-3f844e1a237b3ca425edf1127a3c075a0a0c1de6",
+              "rule_identifier": "spdx-license-identifier-gpl_2_0_plus-a72d250698ecf7ac942b919f4caaaef61adb1ead",
               "rule_url": null
             }
           ],
-          "identifier": "gpl_2_0_plus-1db96703-cb36-48f4-1493-265d3d85eb9e"
+          "identifier": "gpl_2_0_plus-cdfb149f-ba4a-2c30-a8a0-76aa75a6ccf5"
         }
       ],
       "license_clues": [],

From 2f80ae308e5f1a0a413f8c918776cc8f07399f03 Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Tue, 16 Jan 2024 15:22:36 +0530
Subject: [PATCH 10/11] Address feedback and suggestions

Reference: https://github.com/nexB/scancode-toolkit/pull/3620

Signed-off-by: Ayan Sinha Mahapatra 
---
 src/licensedcode/detection.py                 |   9 +-
 src/licensedcode/licenses_reference.py        |   1 +
 src/licensedcode/models.py                    |   2 +
 src/packagedcode/debian_copyright.py          |   1 -
 src/packagedcode/models.py                    |   7 +-
 src/packagedcode/plugin_package.py            |  56 +--
 src/summarycode/todo.py                       |   4 +-
 .../filtered-expected.json                    |   2 +-
 .../filtered-expected2.json                   |   2 +-
 .../filtered-expected3.json                   |   2 +-
 .../data/common/manifests-expected.json       |  20 +-
 .../data/common/manifests-expected.jsonlines  |  20 +-
 .../data/common/manifests-expected.yaml       |  20 +-
 .../data/csv/packages/expected-no-root.csv    |   2 +-
 .../data/csv/packages/expected.csv            |   2 +-
 .../yaml/package-and-licenses-expected.yaml   |  10 +-
 ...tional_license_combined_test.expected.json |   2 +-
 ...ional_license_directory_test.expected.json |   2 +-
 ...ditional_license_plugin_test.expected.json |   2 +-
 ...e-reference-works-with-clues.expected.json |  24 +-
 ...-matched-text-with-reference.expected.json |   6 +-
 .../scan-with-reference.expected.json         |   6 +-
 .../data/match_spdx/scan-expected.json        |   2 +-
 .../unknown-license-expected.json             |   2 +-
 .../unknown-license-text-expected.json        |   2 +-
 .../clues/woodstox.expected.json              |   4 +-
 .../license-expression/scan.expected.json     |   4 +-
 .../spdx-expressions.expected.json            |   2 +-
 .../license-ref-see-copying.expected.json     |   4 +-
 .../license_reference/scan-ref.expected.json  |   4 +-
 ...-unknown-reference-copyright.expected.json |   6 +-
 .../license_reference/scan-wref.expected.json |   2 +-
 ...unknown-ref-to-key-file-root.expected.json |  12 +-
 .../license_url/license_url.expected.json     |   2 +-
 .../package/package.expected.json             |   4 +-
 .../scan/e2fsprogs-expected.json              |   2 +-
 .../scan/ffmpeg-license.expected.json         |  10 +-
 .../sqlite/sqlite.expected.json               |   2 +-
 .../text/scan-diag.expected.json              |   4 +-
 .../plugin_license/text/scan.expected.json    |   4 +-
 .../text_long_lines/scan-diag.expected.json   |   4 +-
 .../text_long_lines/scan.expected.json        |   4 +-
 ...n-unknown-intro-dual-license.expected.json |   2 +-
 ...tro-eclipse-foundation-tycho.expected.json |  20 +-
 ...own-intro-eclipse-foundation.expected.json |   2 +-
 ...nown-intro-long-gaps-between.expected.json |   4 +-
 ...intro-with-imperfect-matches.expected.json |   2 +-
 .../file_with_multiple_licenses.expected.json |   2 +-
 .../policy-codebase.expected.json             |  10 +-
 .../plugin_license_text/scan.expected.json    |   8 +-
 .../data/about/aboutfiles.expected.json       |  48 +--
 ...-container-layer.tar.xz-scan-expected.json |  28 +-
 .../rootfs/alpine-rootfs.tar.xz-expected.json |  28 +-
 .../data/bower/scan-expected.json             |  72 ++--
 .../data/build/buck/end2end-expected.json     |  12 +-
 .../data/cargo/scan.expected.json             |  48 +--
 .../data/chef/package.scan.expected.json      |  36 +-
 .../assemble/many-podspecs-expected.json      | 144 ++++----
 .../many-podspecs-with-license-expected.json  |   6 +-
 .../assemble/multiple-podspec-expected.json   |  48 +--
 .../assemble/single-podspec-expected.json     |  24 +-
 .../solo/RxDataSources.podspec-expected.json  |  24 +-
 .../data/debian/basic-rootfs-expected.json    | 168 ++++-----
 ...r-layer.tar.xz.get-installed-expected.json | 168 ++++-----
 ...-container-layer.tar.xz.scan-expected.json | 168 ++++-----
 ...cted-with-test-manifests-with-license.json |   8 +-
 ...instance-expected-with-test-manifests.json |  24 +-
 ...n-package-instance-expected-with-uuid.json |  24 +-
 .../python-package-instance-expected.json     |  24 +-
 ...ackage-instance-with-license-expected.json |  10 +-
 .../activemq-camel.expected.json              |   4 +-
 ...google-built-collection-diag.expected.json |   2 +-
 .../google-built-collection.expected.json     |   2 +-
 ...lection_without_license_text.expected.json |   2 +-
 .../jquery-form-3.51.0.expected.json          |  28 +-
 .../fizzler.expected.json                     |   8 +-
 .../flutter_playtabs_bridge.expected.json     |   6 +-
 ...ytabs_bridge_without_license.expected.json |  24 +-
 .../nanopb.expected.json                      |   6 +-
 .../nanopb_without_license.expected.json      |  24 +-
 .../reference-to-package/base.expected.json   |  10 +-
 .../fusiondirectory.expected.json             |  28 +-
 .../google_appengine_sdk.expected.json        |  32 +-
 .../paddlenlp.expected.json                   |  34 +-
 .../physics.expected.json                     |  10 +-
 .../reference-to-package/samba.expected.json  |  16 +-
 ...ackson-dataformat-xml-2.13.5-expected.json |   4 +-
 .../johnzon-jsonb-1.2.11-expected.json        |  12 +-
 .../assemble/numbers-1.7.4-expected.json      |   4 +-
 ...htrace-core-4.0.0-incubating-expected.json |   8 +-
 .../data/npm/electron/package.expected.json   |  24 +-
 .../get_package_resources.scan.expected.json  |  24 +-
 .../data/npm/scan-nested/scan.expected.json   |  48 +--
 .../data/plugin/about-package-expected.json   |  48 +--
 .../data/plugin/bower-package-expected.json   |  24 +-
 .../data/plugin/cargo-package-expected.json   |  24 +-
 .../data/plugin/chef-package-expected.json    |  36 +-
 .../data/plugin/com-package-expected.json     |  12 +-
 .../data/plugin/conda-package-expected.json   |  24 +-
 .../data/plugin/cran-package-expected.json    |  24 +-
 .../data/plugin/freebsd-package-expected.json |  24 +-
 .../get_installed_packages-expected.json      | 168 ++++-----
 .../data/plugin/haxe-package-expected.json    |  24 +-
 .../data/plugin/maven-package-expected.json   | 336 +++++++++---------
 .../maven-package-with-license-expected.json  | 336 +++++++++---------
 .../data/plugin/mui-package-expected.json     |  12 +-
 .../data/plugin/mun-package-expected.json     |  12 +-
 .../data/plugin/nuget-package-expected.json   |  24 +-
 .../plugin/phpcomposer-package-expected.json  |  24 +-
 .../data/plugin/python-package-expected.json  | 168 ++++-----
 .../data/plugin/rpm-package-expected.json     |  24 +-
 .../plugin/rubygems-package-expected.json     |  24 +-
 .../data/plugin/sys-package-expected.json     |  12 +-
 .../data/plugin/tlb-package-expected.json     |  12 +-
 .../data/plugin/win_pe-package-expected.json  |  12 +-
 .../data/plugin/winmd-package-expected.json   |  12 +-
 .../site-packages/site-packages-expected.json |  84 ++---
 .../data/pypi/solo-metadata/expected.json     |   2 +-
 .../data/pypi/solo-setup/expected.json        |  24 +-
 .../pip-22.0.4-pypi-package-expected.json     |  96 ++---
 ...ip-22.0.4-pypi-package-setup-expected.json |  24 +-
 ....4-pypi-package-with-license-expected.json |  18 +-
 .../celery-expected.json                      |  72 ++--
 .../daglib_wheel_extracted-expected.json      |  48 +--
 .../bdb-fedora-rootfs.tar.xz-expected.json    | 296 +++++++--------
 tests/packagedcode/test_license_detection.py  |   2 +-
 .../data/composer/composer.expected.json      |  24 +-
 tests/scancode/data/info/all.expected.json    |   4 +-
 .../data/info/all.rooted.expected.json        |   4 +-
 .../scancode/data/license_text/test.expected  |   2 +-
 .../plugin_only_findings/basic.expected.json  |   4 +-
 ...-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json |  24 +-
 .../classify/with_package_data.expected.json  |  48 +--
 .../component-package-build-expected.json     |   8 +-
 .../component-package-expected.json           |   8 +-
 .../license-holder-rollup-expected.json       |   4 +-
 ...iple-same-holder-and-license-expected.json |   2 +-
 ...t-counted-in-license-holders-expected.json |   4 +-
 .../package-fileset-expected.json             |   4 +-
 .../package-manifest-expected.json            |   4 +-
 ...rectory-with-minority-origin-expected.json |   2 +-
 ...return-nested-local-majority-expected.json |   4 +-
 .../data/score/basic-expected.json            |   6 +-
 ...consistent_licenses_copyleft-expected.json |   8 +-
 .../summarycode/data/score/jar-expected.json  |   8 +-
 .../score/no_license_ambiguity-expected.json  |  12 +-
 .../data/score/no_license_text-expected.json  |   4 +-
 ...nflicting_license_categories.expected.json |   8 +-
 .../summary/end-2-end/bug-1141.expected.json  |   4 +-
 .../holders/clear_holder.expected.json        |   6 +-
 .../holders/combined_holders.expected.json    |   6 +-
 .../license_ambiguity/ambiguous.expected.json |   4 +-
 .../unambiguous.expected.json                 |   6 +-
 .../multiple_package_data.expected.json       |  14 +-
 .../single_file/single_file.expected.json     |   2 +-
 .../summary-without-holder-pypi.expected.json |  14 +-
 ...holder_from_package_resource.expected.json |   2 +-
 .../with_package_data.expected.json           |  10 +-
 .../without_package_data.expected.json        |   6 +-
 .../tallies/end-2-end/bug-1141.expected.json  |   4 +-
 .../full_tallies/tallies.expected.json        |  24 +-
 .../tallies_by_facet.expected.json            |  24 +-
 .../tallies_details.expected.json             |  24 +-
 ...lies_key_files-details.expected.json-lines |  22 +-
 .../tallies_key_files.expected.json           |  22 +-
 .../data/tallies/packages/expected.json       |  72 ++--
 .../no_todo/base64-arraybuffer.expected.json  |  10 +-
 .../unknown-license-expected-diag.json        |   2 +-
 .../unknown-license-expected.json             |   2 +-
 169 files changed, 2189 insertions(+), 2173 deletions(-)

diff --git a/src/licensedcode/detection.py b/src/licensedcode/detection.py
index 23da63c5b71..fcba1525f8f 100644
--- a/src/licensedcode/detection.py
+++ b/src/licensedcode/detection.py
@@ -165,14 +165,15 @@ class LicenseDetection:
     license_expression = attr.ib(
         default=None,
         metadata=dict(
-            help='Full license expression string '
-            'using the SPDX license expression syntax and ScanCode license keys.')
+            help='A license expression string using the SPDX license expression'
+            ' syntax and ScanCode license keys, the effective license expression'
+            ' for this license detection.')
     )
 
     license_expression_spdx = attr.ib(
         default=None,
         metadata=dict(
-            help='Full license expression string with SPDX license keys.')
+            help='SPDX license expression string with SPDX ids.')
     )
 
     matches = attr.ib(
@@ -955,7 +956,7 @@ def dict_fields(attr, value):
             return True
 
         detection_mapping = attr.asdict(self, filter=dict_fields)
-        detection_mapping["sample_matches"] = [
+        detection_mapping["reference_matches"] = [
             match.to_dict(
                 include_text=include_text,
                 license_text_diagnostics=license_text_diagnostics,
diff --git a/src/licensedcode/licenses_reference.py b/src/licensedcode/licenses_reference.py
index 68b9ebf7b54..1b01c9a901b 100644
--- a/src/licensedcode/licenses_reference.py
+++ b/src/licensedcode/licenses_reference.py
@@ -97,6 +97,7 @@ def collect_license_and_rule_references(codebase, include_packages=True, include
         if TRACE:
             logger_debug(f'collect_references_from_packages: license keys: {pks}')
             logger_debug(f'collect_references_from_packages: rules by id: {prules}')
+        license_keys.update(pks)
         rules_by_identifier.update(prules)
 
     if include_files:
diff --git a/src/licensedcode/models.py b/src/licensedcode/models.py
index df79830a879..572c35a5821 100644
--- a/src/licensedcode/models.py
+++ b/src/licensedcode/models.py
@@ -2128,6 +2128,8 @@ def from_file(cls, rule_file, is_builtin=True):
 
     @property
     def pysafe_expression(self):
+        """
+        Return a python safe identifier, for use in rule identifiers"""
         return python_safe_name(self.license_expression)
 
     def load_data(self, rule_file):
diff --git a/src/packagedcode/debian_copyright.py b/src/packagedcode/debian_copyright.py
index fe7aebc852d..76069ed1e9e 100644
--- a/src/packagedcode/debian_copyright.py
+++ b/src/packagedcode/debian_copyright.py
@@ -1259,7 +1259,6 @@ def parse_paras_with_license_text(paras_with_license):
                     matches=text_matches, reference_match=common_license_match
                 ):
                     # TODO: Add unknown matches if matches are not consistent
-                    # raise Exception(f'Inconsistent Licenses: {common_license_match} {matches}')
                     pass
 
                 # TODO: Add unknown matches if matches are weak
diff --git a/src/packagedcode/models.py b/src/packagedcode/models.py
index 1e304dc7e08..9d2f0efbabf 100644
--- a/src/packagedcode/models.py
+++ b/src/packagedcode/models.py
@@ -1336,7 +1336,6 @@ def assemble_from_many_datafiles_in_directory(
                         package_data = PackageData.from_dict(package_data)
                         pkgdata_resources.append((package_data, resource,))
 
-        #raise Exception(pkgdata_resources)
         if pkgdata_resources:
             if TRACE:
                 logger_debug(f' assemble_from_many_datafiles: pkgdata_resources: {pkgdata_resources!r}')
@@ -1499,6 +1498,12 @@ def from_package_data(cls, package_data, datafile_path):
         package_data_mapping['datafile_paths'] = [datafile_path]
         package_data_mapping['datasource_ids'] = [dsid]
 
+        license_detections = package_data_mapping['license_detections']
+        for detection in license_detections:
+            for license_match in detection['matches']:
+                if not license_match['from_file']:
+                    license_match['from_file'] = datafile_path
+
         return cls.from_dict(package_data_mapping)
 
     @classmethod
diff --git a/src/packagedcode/plugin_package.py b/src/packagedcode/plugin_package.py
index 90a0a64dd53..78c5464c48d 100644
--- a/src/packagedcode/plugin_package.py
+++ b/src/packagedcode/plugin_package.py
@@ -38,6 +38,8 @@
 from packagedcode.models import PackageWithResources
 
 TRACE = os.environ.get('SCANCODE_DEBUG_PACKAGE_API', False)
+TRACE_ASSEMBLY = os.environ.get('SCANCODE_DEBUG_PACKAGE_ASSEMBLY', False)
+TRACE_LICENSE = os.environ.get('SCANCODE_DEBUG_PACKAGE_LICENSE', False)
 
 
 def logger_debug(*args):
@@ -46,7 +48,7 @@ def logger_debug(*args):
 
 logger = logging.getLogger(__name__)
 
-if TRACE:
+if TRACE or TRACE_LICENSE or TRACE_ASSEMBLY:
     import sys
 
     logging.basicConfig(stream=sys.stdout)
@@ -185,7 +187,7 @@ def get_scanner(self, package=True, system_package=False, **kwargs):
             system=system_package,
         )
 
-    def process_codebase(self, codebase, strip_root=False, license_text=False, license_diagnostics=False, license_text_diagnostics=False, **kwargs):
+    def process_codebase(self, codebase, strip_root=False, **kwargs):
         """
         Populate the ``codebase`` top level ``packages`` and ``dependencies``
         with package and dependency instances, assembling parsed package data
@@ -199,6 +201,20 @@ def process_codebase(self, codebase, strip_root=False, license_text=False, licen
         # These steps add proper license detections to package_data and hence
         # this is performed before top level packages creation
         for resource in codebase.walk(topdown=False):
+            # populate `from_file` attribute in matches
+            for package_data in resource.package_data:
+                for detection in package_data['license_detections']:
+                    populate_matches_with_path(
+                        matches=detection['matches'],
+                        path=resource.path,
+                    )
+
+                for detection in package_data['other_license_detections']:
+                    populate_matches_with_path(
+                        matches=detection['matches'],
+                        path=resource.path,
+                    )
+
             if not has_licenses:
                 #TODO: Add the steps where we detect licenses from files for only a package scan
                 # in the multiprocessing get_package_data API function
@@ -207,7 +223,7 @@ def process_codebase(self, codebase, strip_root=False, license_text=False, licen
             # If we don't detect license in package_data but there is license detected in file
             # we add the license expression from the file to a package
             modified = add_license_from_file(resource, codebase)
-            if TRACE and modified:
+            if TRACE_LICENSE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_license_from_file: modified: {modified}')
 
             if codebase.has_single_resource:
@@ -216,17 +232,18 @@ def process_codebase(self, codebase, strip_root=False, license_text=False, licen
             # If there is referenced files in a extracted license statement, we follow
             # the references, look for license detections and add them back
             modified = list(add_referenced_license_matches_for_package(resource, codebase))
-            if TRACE and modified:
+            if TRACE_LICENSE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_referenced_license_matches_for_package: modified: {modified}')
 
             # If there is a LICENSE file on the same level as the manifest, and no license
             # is detected in the package_data, we add the license from the file
             modified = add_license_from_sibling_file(resource, codebase)
-            if TRACE and modified:
+            if TRACE_LICENSE and modified:
                 logger_debug(f'packagedcode: process_codebase: add_license_from_sibling_file: modified: {modified}')
 
         # Create codebase-level packages and dependencies
         create_package_and_deps(codebase, strip_root=strip_root, **kwargs)
+        #raise Exception()
 
         if has_licenses:
             # This step is dependent on top level packages
@@ -234,7 +251,7 @@ def process_codebase(self, codebase, strip_root=False, license_text=False, licen
                 # If there is a unknown reference to a package we add the license
                 # from the package license detection
                 modified = list(add_referenced_license_detection_from_package(resource, codebase))
-                if TRACE and modified:
+                if TRACE_LICENSE and modified:
                     logger_debug(f'packagedcode: process_codebase: add_referenced_license_matches_from_package: modified: {modified}')
 
 
@@ -244,7 +261,7 @@ def add_license_from_file(resource, codebase):
     and the file has license detections, and if so, populate the package_data license
     expression and detection fields from the file license.
     """
-    if TRACE:
+    if TRACE_LICENSE:
         logger_debug(f'packagedcode.plugin_package: add_license_from_file: resource: {resource.path}')
 
     if not resource.is_file:
@@ -252,7 +269,7 @@ def add_license_from_file(resource, codebase):
 
     license_detections_file = resource.license_detections
 
-    if TRACE:
+    if TRACE_LICENSE:
         logger_debug(f'add_license_from_file: license_detections_file: {license_detections_file}')
     if not license_detections_file:
         return
@@ -263,7 +280,7 @@ def add_license_from_file(resource, codebase):
 
     for pkg in package_data:
         license_detections_pkg = pkg["license_detections"]
-        if TRACE:
+        if TRACE_LICENSE:
             logger_debug(f'add_license_from_file: license_detections_pkg: {license_detections_pkg}')
 
         if not license_detections_pkg:
@@ -329,16 +346,7 @@ def create_package_and_deps(codebase, package_adder=add_to_package, strip_root=F
         **kwargs
     )
 
-    package_mappings = []
-    for package in packages:
-        for detection in package.license_detections:
-            populate_matches_with_path(
-                matches=detection["matches"],
-                path=package.datafile_paths[0],
-            )
-        package_mappings.append(package.to_dict())
-
-    codebase.attributes.packages.extend(package_mappings)
+    codebase.attributes.packages.extend(package.to_dict() for package in packages)
     codebase.attributes.dependencies.extend(dep.to_dict() for dep in dependencies)
 
 
@@ -361,20 +369,20 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals
         if resource.path in seen_resource_paths:
             continue
 
-        if TRACE:
+        if TRACE_ASSEMBLY:
             logger_debug('get_package_and_deps: location:', resource.location)
 
         for package_data in resource.package_data:
             try:
                 package_data = PackageData.from_dict(mapping=package_data)
 
-                if TRACE:
+                if TRACE_ASSEMBLY:
                     logger_debug('  get_package_and_deps: package_data:', package_data)
 
                 # Find a handler for this package datasource to assemble collect
                 # packages and deps
                 handler = get_package_handler(package_data)
-                if TRACE:
+                if TRACE_ASSEMBLY:
                     logger_debug('  get_package_and_deps: handler:', handler)
 
                 items = handler.assemble(
@@ -385,7 +393,7 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals
                 )
 
                 for item in items:
-                    if TRACE:
+                    if TRACE_ASSEMBLY:
                         logger_debug('    get_package_and_deps: item:', item)
 
                     if isinstance(item, Package):
@@ -404,7 +412,7 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals
                     elif isinstance(item, Resource):
                         seen_resource_paths.add(item.path)
 
-                        if TRACE:
+                        if TRACE_ASSEMBLY:
                             logger_debug(
                                 '    get_package_and_deps: seen_resource_path:',
                                 seen_resource_paths,
diff --git a/src/summarycode/todo.py b/src/summarycode/todo.py
index 374e6db55da..4abb247214d 100644
--- a/src/summarycode/todo.py
+++ b/src/summarycode/todo.py
@@ -105,7 +105,7 @@ def process_codebase(self, codebase, **kwargs):
             license_text_diagnostics = kwargs.get("license_text_diagnostics")
             if not license_diagnostics or not license_text or not license_text_diagnostics:
                 usage_suggestion_message = (
-                    "The --review option, whe paired with --license option should be used with the folowing "
+                    "The --todo option, whe paired with --license option should be used with the folowing "
                     "additional CLI options for maximum benifit: [`--license-text`, `--license-text-diagnostics`,"
                     "--license-diagnostics`] as these show additional diagnostic information to help review the issues."
                 )
@@ -118,7 +118,7 @@ def process_codebase(self, codebase, **kwargs):
 
         if not has_packages and not has_licenses:
             usage_suggestion_message = (
-                "The --review option should be used with atleast one of the license [`--license`], "
+                "The --todo option should be used with atleast one of the license [`--license`], "
                 "or package [`--package`] options."
             )
             warnings.simplefilter('always', ToDoPluginUsageWarning)
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
index 38fae8be567..4bfec66a9e4 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json
@@ -5,7 +5,7 @@
       "license_expression": "apache-1.1",
       "license_expression_spdx": "Apache-1.1",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-1.1",
           "license_expression_spdx": "Apache-1.1",
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
index cd899fe24e2..8b142f559f9 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
@@ -5,7 +5,7 @@
       "license_expression": "pygres-2.2",
       "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "pygres-2.2",
           "license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
index 62d33365103..4b3c1211551 100644
--- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
+++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
@@ -5,7 +5,7 @@
       "license_expression": "pcre",
       "license_expression_spdx": "LicenseRef-scancode-pcre",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "pcre",
           "license_expression_spdx": "LicenseRef-scancode-pcre",
diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json
index 1361b556098..71f5d180509 100644
--- a/tests/formattedcode/data/common/manifests-expected.json
+++ b/tests/formattedcode/data/common/manifests-expected.json
@@ -483,7 +483,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -505,7 +505,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -527,7 +527,7 @@
       "license_expression": "cddl-1.0",
       "license_expression_spdx": "CDDL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -563,7 +563,7 @@
       "license_expression": "cddl-1.0",
       "license_expression_spdx": "CDDL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cddl-1.0",
           "license_expression_spdx": "CDDL-1.0",
@@ -599,7 +599,7 @@
       "license_expression": "lgpl-3.0",
       "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0",
           "license_expression_spdx": "LGPL-3.0-only",
@@ -621,7 +621,7 @@
       "license_expression": "lgpl-3.0",
       "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0",
           "license_expression_spdx": "LGPL-3.0-only",
@@ -643,7 +643,7 @@
       "license_expression": "lgpl-3.0",
       "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0",
           "license_expression_spdx": "LGPL-3.0-only",
@@ -665,7 +665,7 @@
       "license_expression": "lgpl-3.0",
       "license_expression_spdx": "LGPL-3.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0",
           "license_expression_spdx": "LGPL-3.0-only",
@@ -687,7 +687,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -709,7 +709,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines
index 530a02dea8d..82435d66394 100644
--- a/tests/formattedcode/data/common/manifests-expected.jsonlines
+++ b/tests/formattedcode/data/common/manifests-expected.jsonlines
@@ -519,7 +519,7 @@
         "license_expression": "apache-2.0",
         "license_expression_spdx": "Apache-2.0",
         "detection_count": 3,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "apache-2.0",
             "license_expression_spdx": "Apache-2.0",
@@ -541,7 +541,7 @@
         "license_expression": "apache-2.0",
         "license_expression_spdx": "Apache-2.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "apache-2.0",
             "license_expression_spdx": "Apache-2.0",
@@ -563,7 +563,7 @@
         "license_expression": "cddl-1.0",
         "license_expression_spdx": "CDDL-1.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "unknown-license-reference",
             "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -599,7 +599,7 @@
         "license_expression": "cddl-1.0",
         "license_expression_spdx": "CDDL-1.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "cddl-1.0",
             "license_expression_spdx": "CDDL-1.0",
@@ -635,7 +635,7 @@
         "license_expression": "lgpl-3.0",
         "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 2,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "lgpl-3.0",
             "license_expression_spdx": "LGPL-3.0-only",
@@ -657,7 +657,7 @@
         "license_expression": "lgpl-3.0",
         "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "lgpl-3.0",
             "license_expression_spdx": "LGPL-3.0-only",
@@ -679,7 +679,7 @@
         "license_expression": "lgpl-3.0",
         "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "lgpl-3.0",
             "license_expression_spdx": "LGPL-3.0-only",
@@ -701,7 +701,7 @@
         "license_expression": "lgpl-3.0",
         "license_expression_spdx": "LGPL-3.0-only",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "lgpl-3.0",
             "license_expression_spdx": "LGPL-3.0-only",
@@ -723,7 +723,7 @@
         "license_expression": "mit",
         "license_expression_spdx": "MIT",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "mit",
             "license_expression_spdx": "MIT",
@@ -745,7 +745,7 @@
         "license_expression": "mit",
         "license_expression_spdx": "MIT",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "mit",
             "license_expression_spdx": "MIT",
diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml
index 9f78f8c836d..cc393bef071 100644
--- a/tests/formattedcode/data/common/manifests-expected.yaml
+++ b/tests/formattedcode/data/common/manifests-expected.yaml
@@ -476,7 +476,7 @@ license_detections:
     license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     detection_count: 3
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: manifests/npm-license-mapping/package.json
@@ -494,7 +494,7 @@ license_detections:
     license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: manifests/npm-license-mapping/package.json
@@ -512,7 +512,7 @@ license_detections:
     license_expression: cddl-1.0
     license_expression_spdx: CDDL-1.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: unknown-license-reference
         license_expression_spdx: LicenseRef-scancode-unknown-license-reference
         from_file: manifests/maven/persistence-api-1.0.pom
@@ -549,7 +549,7 @@ license_detections:
     license_expression: cddl-1.0
     license_expression_spdx: CDDL-1.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: cddl-1.0
         license_expression_spdx: CDDL-1.0
         from_file: manifests/maven/persistence-api-1.0.pom
@@ -580,7 +580,7 @@ license_detections:
     license_expression: lgpl-3.0
     license_expression_spdx: LGPL-3.0-only
     detection_count: 2
-    sample_matches:
+    reference_matches:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
@@ -600,7 +600,7 @@ license_detections:
     license_expression: lgpl-3.0
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
@@ -630,7 +630,7 @@ license_detections:
     license_expression: lgpl-3.0
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
@@ -648,7 +648,7 @@ license_detections:
     license_expression: lgpl-3.0
     license_expression_spdx: LGPL-3.0-only
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: lgpl-3.0
         license_expression_spdx: LGPL-3.0-only
         from_file: manifests/pypi/bluepyopt_setup.py
@@ -666,7 +666,7 @@ license_detections:
     license_expression: mit
     license_expression_spdx: MIT
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: mit
         license_expression_spdx: MIT
         from_file: manifests/npm-license-string/package.json
@@ -684,7 +684,7 @@ license_detections:
     license_expression: mit
     license_expression_spdx: MIT
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: mit
         license_expression_spdx: MIT
         from_file: manifests/npm-license-string/package.json
diff --git a/tests/formattedcode/data/csv/packages/expected-no-root.csv b/tests/formattedcode/data/csv/packages/expected-no-root.csv
index 0935a8bc174..2e4db847a2e 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__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': None, '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', '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
 ",,,,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 fc6eabd0362..4ecb6b8c16a 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__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': None, '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', '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
 ",,,,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/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
index 7e90442ddb1..fbade404bda 100644
--- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
+++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml
@@ -126,7 +126,7 @@ license_detections:
     license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/apache-2.0.LICENSE
@@ -282,7 +282,7 @@ license_detections:
     license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/setup.cfg
@@ -300,7 +300,7 @@ license_detections:
     license_expression: apache-2.0
     license_expression_spdx: Apache-2.0
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/setup.cfg
@@ -318,7 +318,7 @@ license_detections:
     license_expression: apache-2.0 AND (apache-2.0 OR mit)
     license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT)
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: apache-2.0
         license_expression_spdx: Apache-2.0
         from_file: package-and-licenses/README.txt
@@ -349,7 +349,7 @@ license_detections:
     license_expression: mit
     license_expression_spdx: MIT
     detection_count: 1
-    sample_matches:
+    reference_matches:
       - license_expression: mit
         license_expression_spdx: MIT
         from_file: package-and-licenses/mit.LICENSE
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 6929ca6f37a..6f95f593464 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
@@ -5,7 +5,7 @@
       "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0",
       "license_expression_spdx": "scancode-example-installed1 AND LicenseRef-scancode-example-installed2 AND scancode-example1 AND scancode-example2 AND Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "example-installed-1",
           "license_expression_spdx": "scancode-example-installed1",
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 d6669c4dd88..2958a7cba25 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
@@ -5,7 +5,7 @@
       "license_expression": "example1 AND example2",
       "license_expression_spdx": "scancode-example1 AND scancode-example2",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "example1",
           "license_expression_spdx": "scancode-example1",
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 308da786975..b61818ca0bd 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
@@ -5,7 +5,7 @@
       "license_expression": "example-installed-1",
       "license_expression_spdx": "scancode-example-installed1",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "example-installed-1",
           "license_expression_spdx": "scancode-example-installed1",
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 b4757f6629d..64a75985c9e 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -58,7 +58,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -99,7 +99,7 @@
       "license_expression_spdx": "LicenseRef-scancode-openssl",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "openssl",
           "license_expression_spdx": "LicenseRef-scancode-openssl",
@@ -126,7 +126,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -183,7 +183,7 @@
       "license_expression_spdx": "LicenseRef-scancode-other-copyleft AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "other-copyleft",
           "license_expression_spdx": "LicenseRef-scancode-other-copyleft",
@@ -320,7 +320,7 @@
       "license_expression_spdx": "Python-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "python",
           "license_expression_spdx": "Python-2.0",
@@ -345,7 +345,7 @@
       "license_expression_spdx": "Python-2.0 AND LicenseRef-scancode-python-cwi",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "python",
           "license_expression_spdx": "Python-2.0",
@@ -388,7 +388,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -429,7 +429,7 @@
       "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "ssleay-windows",
           "license_expression_spdx": "LicenseRef-scancode-ssleay-windows",
@@ -456,7 +456,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -499,7 +499,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 60105bffea7..4393aba280b 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
@@ -91,7 +91,7 @@
       "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -132,7 +132,7 @@
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -157,7 +157,7 @@
       "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0 OR mit",
           "license_expression_spdx": "Artistic-2.0 OR MIT",
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 5ec2ad67206..07705dbc4a4 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
@@ -90,7 +90,7 @@
       "license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
       "license_expression_spdx": "Apache-2.0 AND (MIT OR BSD-2-Clause)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -126,7 +126,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -148,7 +148,7 @@
       "license_expression": "artistic-2.0 OR mit",
       "license_expression_spdx": "Artistic-2.0 OR MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0 OR mit",
           "license_expression_spdx": "Artistic-2.0 OR MIT",
diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json
index c7812b7f436..eee03de60ee 100644
--- a/tests/licensedcode/data/match_spdx/scan-expected.json
+++ b/tests/licensedcode/data/match_spdx/scan-expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/licensedcode/data/match_unknown/unknown-license-expected.json b/tests/licensedcode/data/match_unknown/unknown-license-expected.json
index 77e9141e38d..2d11e9e21b4 100644
--- a/tests/licensedcode/data/match_unknown/unknown-license-expected.json
+++ b/tests/licensedcode/data/match_unknown/unknown-license-expected.json
@@ -5,7 +5,7 @@
       "license_expression": "unknown",
       "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown",
           "license_expression_spdx": "LicenseRef-scancode-unknown",
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 ee2faf2b8cc..00bc16f1ee9 100644
--- a/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json
+++ b/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown",
           "license_expression_spdx": "LicenseRef-scancode-unknown",
diff --git a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
index bbb24485014..d58558a07a3 100644
--- a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
+++ b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 be4307a2e65..56a7e854810 100644
--- a/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "Apache-1.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-1.0",
           "license_expression_spdx": "Apache-1.0",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
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 b8fd638cc7b..e501546e7f5 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "Zlib AND Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
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 af43ebfd28c..9a7ba129e75 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -49,7 +49,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 3564cab0722..66c3bb8d634 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -49,7 +49,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 c2469b47715..79c2c8b3602 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -51,7 +51,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -92,7 +92,7 @@
       "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "x11-xconsortium-veillard",
           "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard",
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 45105c9bb22..7a1c99517fa 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 1cd3f46bf1d..707530d5e4b 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -65,7 +65,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -90,7 +90,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -133,7 +133,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -190,7 +190,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -215,7 +215,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 50fb88bd485..1fdbc5ddfbd 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
@@ -5,7 +5,7 @@
       "license_expression": "apache-1.0",
       "license_expression_spdx": "Apache-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-1.0",
           "license_expression_spdx": "Apache-1.0",
diff --git a/tests/licensedcode/data/plugin_license/package/package.expected.json b/tests/licensedcode/data/plugin_license/package/package.expected.json
index 124c86075df..64e9b60606f 100644
--- a/tests/licensedcode/data/plugin_license/package/package.expected.json
+++ b/tests/licensedcode/data/plugin_license/package/package.expected.json
@@ -119,7 +119,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -141,7 +141,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
index f1500157a39..f8393eeead1 100644
--- a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
+++ b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
@@ -5,7 +5,7 @@
       "license_expression": "gpl-2.0 AND patent-disclaimer",
       "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 AND patent-disclaimer",
           "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer",
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 fd96232f1b0..07807553ad2 100644
--- a/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json
+++ b/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "GPL-2.0-only AND Apache-2.0 AND LGPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
@@ -90,7 +90,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -147,7 +147,7 @@
       "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1-plus AND other-permissive AND gpl-2.0-plus",
           "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later",
@@ -172,7 +172,7 @@
       "license_expression_spdx": "LGPL-3.0-only AND LGPL-3.0-or-later AND (LGPL-3.0-only AND GPL-3.0-only)",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0",
           "license_expression_spdx": "LGPL-3.0-only",
diff --git a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
index 18eb3203315..0cacc4cae52 100644
--- a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
+++ b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json
@@ -5,7 +5,7 @@
       "license_expression": "blessing",
       "license_expression_spdx": "blessing",
       "detection_count": 136,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "blessing",
           "license_expression_spdx": "blessing",
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 2f7a47566e2..121abb25093 100644
--- a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "FSFAP",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "fsf-ap",
           "license_expression_spdx": "FSFAP",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
diff --git a/tests/licensedcode/data/plugin_license/text/scan.expected.json b/tests/licensedcode/data/plugin_license/text/scan.expected.json
index 6e04e62d5e0..3eec66406ea 100644
--- a/tests/licensedcode/data/plugin_license/text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license/text/scan.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "FSFAP",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "fsf-ap",
           "license_expression_spdx": "FSFAP",
@@ -30,7 +30,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
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 f55ea1fb613..c66391c04f7 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "Unlicense",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unlicense",
           "license_expression_spdx": "Unlicense",
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 f55ea1fb613..c66391c04f7 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "Unlicense",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unlicense",
           "license_expression_spdx": "Unlicense",
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 053eb6c9d33..b6da7a80579 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 1ee4d13d399..18cb7a79fa9 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -56,7 +56,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -81,7 +81,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -122,7 +122,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -147,7 +147,7 @@
       "license_expression_spdx": "CPL-1.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cpl-1.0",
           "license_expression_spdx": "CPL-1.0",
@@ -172,7 +172,7 @@
       "license_expression_spdx": "CPL-1.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cpl-1.0",
           "license_expression_spdx": "CPL-1.0",
@@ -197,7 +197,7 @@
       "license_expression_spdx": "EPL-1.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "epl-1.0",
           "license_expression_spdx": "EPL-1.0",
@@ -222,7 +222,7 @@
       "license_expression_spdx": "EPL-1.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "epl-1.0",
           "license_expression_spdx": "EPL-1.0",
@@ -247,7 +247,7 @@
       "license_expression_spdx": "EPL-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "epl-2.0",
           "license_expression_spdx": "EPL-2.0",
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 eeadbee755b..95c5ee2e754 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
@@ -6,7 +6,7 @@
       "license_expression_spdx": "EPL-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "epl-2.0",
           "license_expression_spdx": "EPL-2.0",
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 75861d282c9..4462d239222 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -51,7 +51,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 2e17dcc0167..933fb62f12f 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-intro-followed-by-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 233bade5a0e..fbf755b9161 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
@@ -5,7 +5,7 @@
       "license_expression": "apache-2.0 AND gpl-3.0",
       "license_expression_spdx": "Apache-2.0 AND GPL-3.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 bb1665f455a..7120bfe2aca 100644
--- a/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json
+++ b/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json
@@ -5,7 +5,7 @@
       "license_expression": "broadcom-commercial",
       "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "broadcom-commercial",
           "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial",
@@ -27,7 +27,7 @@
       "license_expression": "bsd-1988",
       "license_expression_spdx": "LicenseRef-scancode-bsd-1988",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-1988",
           "license_expression_spdx": "LicenseRef-scancode-bsd-1988",
@@ -49,7 +49,7 @@
       "license_expression": "esri-devkit",
       "license_expression_spdx": "LicenseRef-scancode-esri-devkit",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "esri-devkit",
           "license_expression_spdx": "LicenseRef-scancode-esri-devkit",
@@ -71,7 +71,7 @@
       "license_expression": "oracle-java-ee-sdk-2010",
       "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "oracle-java-ee-sdk-2010",
           "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010",
@@ -93,7 +93,7 @@
       "license_expression": "rh-eula",
       "license_expression_spdx": "LicenseRef-scancode-rh-eula",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "rh-eula",
           "license_expression_spdx": "LicenseRef-scancode-rh-eula",
diff --git a/tests/licensedcode/data/plugin_license_text/scan.expected.json b/tests/licensedcode/data/plugin_license_text/scan.expected.json
index 8dec8645cc8..39b925f9bb8 100644
--- a/tests/licensedcode/data/plugin_license_text/scan.expected.json
+++ b/tests/licensedcode/data/plugin_license_text/scan.expected.json
@@ -6,7 +6,7 @@
       "license_expression_spdx": "Apache-1.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-1.0",
           "license_expression_spdx": "Apache-1.0",
@@ -31,7 +31,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -56,7 +56,7 @@
       "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib",
           "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB",
@@ -81,7 +81,7 @@
       "license_expression_spdx": "LicenseRef-scancode-ja-sig",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "ja-sig",
           "license_expression_spdx": "LicenseRef-scancode-ja-sig",
diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json
index 0ddfa45d308..e998ddb00b3 100644
--- a/tests/packagedcode/data/about/aboutfiles.expected.json
+++ b/tests/packagedcode/data/about/aboutfiles.expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "aboutfiles/apipkg.ABOUT",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "aboutfiles/apipkg.ABOUT",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -117,17 +117,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "aboutfiles/appdirs.ABOUT",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "aboutfiles/appdirs.ABOUT",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -229,17 +229,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "aboutfiles/apipkg.ABOUT",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -322,17 +322,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "aboutfiles/appdirs.ABOUT",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
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 fdb5816a85b..36ce68a399e 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
@@ -2219,7 +2219,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -2423,7 +2423,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -2519,7 +2519,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -2660,7 +2660,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -2875,7 +2875,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3322,7 +3322,7 @@
                 {
                   "license_expression": "mpl-2.0 AND mit",
                   "spdx_license_expression": "MPL-2.0 AND MIT",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3418,7 +3418,7 @@
                 {
                   "license_expression": "openssl-ssleay",
                   "spdx_license_expression": "OpenSSL",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3604,7 +3604,7 @@
                 {
                   "license_expression": "openssl-ssleay",
                   "spdx_license_expression": "OpenSSL",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3700,7 +3700,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -3787,7 +3787,7 @@
                 {
                   "license_expression": "zlib",
                   "spdx_license_expression": "Zlib",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3883,7 +3883,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -4000,7 +4000,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -4087,7 +4087,7 @@
                 {
                   "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",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -4221,7 +4221,7 @@
                 {
                   "license_expression": "bsd-simplified AND bsd-new",
                   "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
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 cdbc776419c..2e3d736fcaf 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
@@ -2205,7 +2205,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -2301,7 +2301,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -2442,7 +2442,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -2772,7 +2772,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3219,7 +3219,7 @@
                 {
                   "license_expression": "mpl-2.0 AND mit",
                   "spdx_license_expression": "MPL-2.0 AND MIT",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3315,7 +3315,7 @@
                 {
                   "license_expression": "openssl-ssleay",
                   "spdx_license_expression": "OpenSSL",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3492,7 +3492,7 @@
                 {
                   "license_expression": "openssl-ssleay",
                   "spdx_license_expression": "OpenSSL",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3588,7 +3588,7 @@
                 {
                   "license_expression": "isc AND (bsd-new OR mit)",
                   "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3695,7 +3695,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -3782,7 +3782,7 @@
                 {
                   "license_expression": "zlib",
                   "spdx_license_expression": "Zlib",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -3878,7 +3878,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -3995,7 +3995,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -4082,7 +4082,7 @@
                 {
                   "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",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -4216,7 +4216,7 @@
                 {
                   "license_expression": "bsd-simplified AND bsd-new",
                   "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "alpine-rootfs/lib/apk/db/installed",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
diff --git a/tests/packagedcode/data/bower/scan-expected.json b/tests/packagedcode/data/bower/scan-expected.json
index 3473a114c27..67a6d4e05eb 100644
--- a/tests/packagedcode/data/bower/scan-expected.json
+++ b/tests/packagedcode/data/bower/scan-expected.json
@@ -51,17 +51,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "scan/bower.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/bower.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -73,17 +73,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan/bower.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/bower.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "Apache 2.0"
             }
@@ -95,17 +95,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "scan/bower.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/bower.json",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
               "matched_text": "BSD-3-Clause"
             }
@@ -240,17 +240,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "scan/bower.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -262,17 +262,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "scan/bower.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
                   "matched_text": "Apache 2.0"
                 }
@@ -284,17 +284,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "scan/bower.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
                   "matched_text": "BSD-3-Clause"
                 }
diff --git a/tests/packagedcode/data/build/buck/end2end-expected.json b/tests/packagedcode/data/build/buck/end2end-expected.json
index 866de9f3c62..70f7b321317 100644
--- a/tests/packagedcode/data/build/buck/end2end-expected.json
+++ b/tests/packagedcode/data/build/buck/end2end-expected.json
@@ -78,17 +78,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": null,
               "start_line": 1,
               "end_line": 1,
-              "from_file": "end2end/subdir2/BUCK",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
               "matched_text": "apache-2.0"
             }
diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json
index 9296b7a1f34..b0207904e3a 100644
--- a/tests/packagedcode/data/cargo/scan.expected.json
+++ b/tests/packagedcode/data/cargo/scan.expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MPL-2.0",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "mpl-2.0",
+              "spdx_license_expression": "MPL-2.0",
+              "from_file": "scan/Cargo.toml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/Cargo.toml",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mpl-2.0",
-              "spdx_license_expression": "MPL-2.0",
-              "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
               "matched_text": "MPL-2.0"
             }
@@ -124,17 +124,17 @@
           "license_expression_spdx": "MIT OR Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit OR apache-2.0",
+              "spdx_license_expression": "MIT OR Apache-2.0",
+              "from_file": "scan/dac/Cargo.toml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/dac/Cargo.toml",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit OR apache-2.0",
-              "spdx_license_expression": "MIT OR Apache-2.0",
-              "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_or_apache-2.0_15.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
               "matched_text": "MIT OR Apache-2.0"
             }
@@ -773,17 +773,17 @@
               "license_expression_spdx": "MPL-2.0",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "mpl-2.0",
+                  "spdx_license_expression": "MPL-2.0",
+                  "from_file": "scan/Cargo.toml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mpl-2.0",
-                  "spdx_license_expression": "MPL-2.0",
-                  "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_mpl-2.0_for_mpl-2.0.RULE",
                   "matched_text": "MPL-2.0"
                 }
@@ -870,17 +870,17 @@
               "license_expression_spdx": "MIT OR Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit OR apache-2.0",
+                  "spdx_license_expression": "MIT OR Apache-2.0",
+                  "from_file": "scan/dac/Cargo.toml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit OR apache-2.0",
-                  "spdx_license_expression": "MIT OR Apache-2.0",
-                  "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_or_apache-2.0_15.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_or_apache-2.0_15.RULE",
                   "matched_text": "MIT OR Apache-2.0"
                 }
diff --git a/tests/packagedcode/data/chef/package.scan.expected.json b/tests/packagedcode/data/chef/package.scan.expected.json
index 8bf1db0cf06..06e7dac0749 100644
--- a/tests/packagedcode/data/chef/package.scan.expected.json
+++ b/tests/packagedcode/data/chef/package.scan.expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/metadata.rb",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package/metadata.rb",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -162,17 +162,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/metadata.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -256,17 +256,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/metadata.rb",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
index da0bc6d969c..57ef920e152 100644
--- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -117,17 +117,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/Amplify.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/Amplify.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -194,17 +194,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyPlugins.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AmplifyPlugins.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -271,17 +271,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AmplifyTestCommon.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -348,17 +348,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPluginsCore.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AWSPluginsCore.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -425,17 +425,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "Apache License, Version 2.0"
             }
@@ -629,17 +629,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AWSPluginsCore.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -712,17 +712,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AWSPredictionsPlugin.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -795,17 +795,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/Amplify.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -878,17 +878,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AmplifyPlugins.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -961,17 +961,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/AmplifyTestCommon.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
@@ -1044,17 +1044,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "Apache License, Version 2.0"
                 }
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 47e696a0b52..3a2a30b8db5 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
@@ -583,7 +583,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -605,7 +605,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -627,7 +627,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
diff --git a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
index 736a1e14f19..68022a70270 100644
--- a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "multiple-podspec/RxDataSources.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "multiple-podspec/RxDataSources.podspec",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -117,17 +117,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "multiple-podspec/Differentiator.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "multiple-podspec/Differentiator.podspec",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -251,17 +251,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "multiple-podspec/Differentiator.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -469,17 +469,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "multiple-podspec/RxDataSources.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
index c809dd28693..ddb4b0d072f 100644
--- a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "single-podspec/RxDataSources.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "single-podspec/RxDataSources.podspec",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -309,17 +309,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "single-podspec/RxDataSources.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
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 1fbcab6aedc..3c5305e93e1 100644
--- a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json
+++ b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "RxDataSources.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "RxDataSources.podspec",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -124,17 +124,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "RxDataSources.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json
index aa10b59701b..2d4b56f6fa5 100644
--- a/tests/packagedcode/data/debian/basic-rootfs-expected.json
+++ b/tests/packagedcode/data/debian/basic-rootfs-expected.json
@@ -44,17 +44,17 @@
           "license_expression_spdx": "X11-distribute-modifications-variant",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-fsf",
+              "spdx_license_expression": "X11-distribute-modifications-variant",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
               "start_line": 23,
               "end_line": 45,
-              "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 200,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-fsf",
-              "spdx_license_expression": "X11-distribute-modifications-variant",
-              "rule_identifier": "x11-fsf.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-fsf.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
@@ -66,17 +66,17 @@
           "license_expression_spdx": "X11",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
               "start_line": 50,
               "end_line": 70,
-              "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 201,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-xconsortium",
-              "spdx_license_expression": "X11",
-              "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
             }
@@ -88,17 +88,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
               "start_line": 76,
               "end_line": 98,
-              "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 213,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_19.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
               "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
             }
@@ -110,17 +110,17 @@
           "license_expression_spdx": "X11",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
               "start_line": 105,
               "end_line": 127,
-              "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 199,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-xconsortium",
-              "spdx_license_expression": "X11",
-              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
@@ -240,47 +240,47 @@
           "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
               "start_line": 13,
               "end_line": 13,
-              "from_file": null,
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "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+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
               "start_line": 14,
               "end_line": 26,
-              "from_file": null,
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 117,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
               "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
+              "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
               "start_line": 24,
               "end_line": 30,
-              "from_file": null,
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 64,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1",
-              "spdx_license_expression": "LGPL-2.1-only",
-              "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
               "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
             }
@@ -406,17 +406,17 @@
               "license_expression_spdx": "X11-distribute-modifications-variant",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-fsf",
+                  "spdx_license_expression": "X11-distribute-modifications-variant",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                   "start_line": 23,
                   "end_line": 45,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 200,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-fsf",
-                  "spdx_license_expression": "X11-distribute-modifications-variant",
-                  "rule_identifier": "x11-fsf.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-fsf.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
@@ -428,17 +428,17 @@
               "license_expression_spdx": "X11",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                   "start_line": 50,
                   "end_line": 70,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 201,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-xconsortium",
-                  "spdx_license_expression": "X11",
-                  "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
                 }
@@ -450,17 +450,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                   "start_line": 76,
                   "end_line": 98,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 213,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_19.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_19.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
                   "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
                 }
@@ -472,17 +472,17 @@
               "license_expression_spdx": "X11",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                   "start_line": 105,
                   "end_line": 127,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 199,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-xconsortium",
-                  "spdx_license_expression": "X11",
-                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
@@ -557,47 +557,47 @@
               "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                   "start_line": 13,
                   "end_line": 13,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "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+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                   "start_line": 14,
                   "end_line": 26,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 117,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
                   "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1",
+                  "spdx_license_expression": "LGPL-2.1-only",
+                  "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                   "start_line": 24,
                   "end_line": 30,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 64,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1",
-                  "spdx_license_expression": "LGPL-2.1-only",
-                  "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
                   "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
                 }
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 de7bc031ce7..3861deb82d2 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
@@ -43,17 +43,17 @@
         "license_expression_spdx": "X11-distribute-modifications-variant",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-fsf",
+            "spdx_license_expression": "X11-distribute-modifications-variant",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
             "start_line": 23,
             "end_line": 45,
-            "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 200,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-fsf",
-            "spdx_license_expression": "X11-distribute-modifications-variant",
-            "rule_identifier": "x11-fsf.LICENSE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-fsf.LICENSE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
           }
@@ -65,17 +65,17 @@
         "license_expression_spdx": "X11",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
             "start_line": 50,
             "end_line": 70,
-            "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 201,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-xconsortium",
-            "spdx_license_expression": "X11",
-            "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
           }
@@ -87,17 +87,17 @@
         "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
             "start_line": 76,
             "end_line": 98,
-            "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 213,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "bsd-new",
-            "spdx_license_expression": "BSD-3-Clause",
-            "rule_identifier": "bsd-new_19.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "bsd-new_19.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
             "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
           }
@@ -109,17 +109,17 @@
         "license_expression_spdx": "X11",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
             "start_line": 105,
             "end_line": 127,
-            "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 199,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-xconsortium",
-            "spdx_license_expression": "X11",
-            "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
           }
@@ -227,17 +227,17 @@
                 "license_expression_spdx": "X11-distribute-modifications-variant",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-fsf",
+                    "spdx_license_expression": "X11-distribute-modifications-variant",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                     "start_line": 23,
                     "end_line": 45,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 200,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-fsf",
-                    "spdx_license_expression": "X11-distribute-modifications-variant",
-                    "rule_identifier": "x11-fsf.LICENSE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-fsf.LICENSE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                   }
@@ -249,17 +249,17 @@
                 "license_expression_spdx": "X11",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                     "start_line": 50,
                     "end_line": 70,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 201,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-xconsortium",
-                    "spdx_license_expression": "X11",
-                    "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
                   }
@@ -271,17 +271,17 @@
                 "license_expression_spdx": "BSD-3-Clause",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "bsd-new",
+                    "spdx_license_expression": "BSD-3-Clause",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                     "start_line": 76,
                     "end_line": 98,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 213,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "bsd-new",
-                    "spdx_license_expression": "BSD-3-Clause",
-                    "rule_identifier": "bsd-new_19.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "bsd-new_19.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
                     "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
                   }
@@ -293,17 +293,17 @@
                 "license_expression_spdx": "X11",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                     "start_line": 105,
                     "end_line": 127,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 199,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-xconsortium",
-                    "spdx_license_expression": "X11",
-                    "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                   }
@@ -473,47 +473,47 @@
         "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
             "start_line": 13,
             "end_line": 13,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "lgpl-2.1-plus",
-            "spdx_license_expression": "LGPL-2.1-or-later",
-            "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "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+"
           },
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
             "start_line": 14,
             "end_line": 26,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 117,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-2.1-plus",
-            "spdx_license_expression": "LGPL-2.1-or-later",
-            "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
             "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
           },
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
+            "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
             "start_line": 24,
             "end_line": 30,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 64,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-2.1",
-            "spdx_license_expression": "LGPL-2.1-only",
-            "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
             "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
           }
@@ -603,47 +603,47 @@
                 "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                     "start_line": 13,
                     "end_line": 13,
-                    "from_file": null,
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 4,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "lgpl-2.1-plus",
-                    "spdx_license_expression": "LGPL-2.1-or-later",
-                    "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "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+"
                   },
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                     "start_line": 14,
                     "end_line": 26,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 117,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "lgpl-2.1-plus",
-                    "spdx_license_expression": "LGPL-2.1-or-later",
-                    "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
                     "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
                   },
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1",
+                    "spdx_license_expression": "LGPL-2.1-only",
+                    "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                     "start_line": 24,
                     "end_line": 30,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 64,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "lgpl-2.1",
-                    "spdx_license_expression": "LGPL-2.1-only",
-                    "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
                     "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
                   }
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 8bb7c95f7c7..00d1530c108 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
@@ -44,17 +44,17 @@
           "license_expression_spdx": "X11-distribute-modifications-variant",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-fsf",
+              "spdx_license_expression": "X11-distribute-modifications-variant",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
               "start_line": 23,
               "end_line": 45,
-              "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 200,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-fsf",
-              "spdx_license_expression": "X11-distribute-modifications-variant",
-              "rule_identifier": "x11-fsf.LICENSE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-fsf.LICENSE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
@@ -66,17 +66,17 @@
           "license_expression_spdx": "X11",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
               "start_line": 50,
               "end_line": 70,
-              "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 201,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-xconsortium",
-              "spdx_license_expression": "X11",
-              "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-xconsortium_2.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
             }
@@ -88,17 +88,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
               "start_line": 76,
               "end_line": 98,
-              "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 213,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_19.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_19.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
               "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
             }
@@ -110,17 +110,17 @@
           "license_expression_spdx": "X11",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "x11-xconsortium",
+              "spdx_license_expression": "X11",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
               "start_line": 105,
               "end_line": 127,
-              "from_file": "debian-container-layer.tar.xz/var/lib/dpkg/status",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 199,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "x11-xconsortium",
-              "spdx_license_expression": "X11",
-              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
@@ -240,47 +240,47 @@
           "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
               "start_line": 13,
               "end_line": 13,
-              "from_file": null,
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 4,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_108.RULE",
               "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+"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
               "start_line": 14,
               "end_line": 26,
-              "from_file": null,
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 117,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1-plus_93.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
               "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1",
+              "spdx_license_expression": "LGPL-2.1-only",
+              "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
               "start_line": 24,
               "end_line": 30,
-              "from_file": null,
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 64,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1",
-              "spdx_license_expression": "LGPL-2.1-only",
-              "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.1_314.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
               "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
             }
@@ -420,17 +420,17 @@
               "license_expression_spdx": "X11-distribute-modifications-variant",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-fsf",
+                  "spdx_license_expression": "X11-distribute-modifications-variant",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                   "start_line": 23,
                   "end_line": 45,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 200,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-fsf",
-                  "spdx_license_expression": "X11-distribute-modifications-variant",
-                  "rule_identifier": "x11-fsf.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-fsf.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
@@ -442,17 +442,17 @@
               "license_expression_spdx": "X11",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                   "start_line": 50,
                   "end_line": 70,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 201,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-xconsortium",
-                  "spdx_license_expression": "X11",
-                  "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-xconsortium_2.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
                 }
@@ -464,17 +464,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                   "start_line": 76,
                   "end_line": 98,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 213,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_19.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_19.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
                   "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
                 }
@@ -486,17 +486,17 @@
               "license_expression_spdx": "X11",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "x11-xconsortium",
+                  "spdx_license_expression": "X11",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright",
                   "start_line": 105,
                   "end_line": 127,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 199,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "x11-xconsortium",
-                  "spdx_license_expression": "X11",
-                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
@@ -571,47 +571,47 @@
               "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                   "start_line": 13,
                   "end_line": 13,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 4,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_108.RULE",
                   "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+"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                   "start_line": 14,
                   "end_line": 26,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 117,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1-plus_93.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
                   "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1",
+                  "spdx_license_expression": "LGPL-2.1-only",
+                  "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright",
                   "start_line": 24,
                   "end_line": 30,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 64,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1",
-                  "spdx_license_expression": "LGPL-2.1-only",
-                  "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.1_314.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
                   "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.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 7d43a239e0a..8d6ebf9f0cc 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
@@ -52,7 +52,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "PKG-INFO",
+              "from_file": "pypi-with-test-manifests/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -97,7 +97,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 4,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -119,7 +119,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -141,7 +141,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 f25cce320d6..2d8dc56bbc1 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
@@ -50,17 +50,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi-with-test-manifests/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -164,17 +164,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi-with-test-manifests/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
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 f3261a40357..2944eaba654 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/setup.cfg",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.cfg",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_1305.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
               "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
             }
@@ -185,17 +185,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/setup.cfg",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
                   "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
                 }
diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json
index f3261a40357..2944eaba654 100644
--- a/tests/packagedcode/data/instance/python-package-instance-expected.json
+++ b/tests/packagedcode/data/instance/python-package-instance-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/setup.cfg",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "setup.cfg",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_1305.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_1305.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
               "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
             }
@@ -185,17 +185,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/setup.cfg",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_1305.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1305.RULE",
                   "matched_text": "BSD-3-Clause license_files: LICENSE.rst"
                 }
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 a5f0a8f6ca6..7bee9e8eaea 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
@@ -42,7 +42,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "setup.cfg",
+              "from_file": "pypi/setup.cfg",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -146,7 +146,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -171,7 +171,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -210,7 +210,7 @@
       "detection_log": [
         "package-unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -247,7 +247,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
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 7d6382ba015..d154e50adb6 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
@@ -34,7 +34,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "activemq-camel-pom.xml",
+              "from_file": "activemq-camel/activemq-camel-pom.xml",
               "start_line": 3,
               "end_line": 16,
               "matcher": "2-aho",
@@ -241,7 +241,7 @@
       "detection_log": [
         "from-package-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 d6658f3e2f0..7d58bae88ea 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
@@ -123,7 +123,7 @@
         "license_expression_spdx": "BSD-3-Clause",
         "detection_count": 2,
         "detection_log": [],
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "bsd-new",
             "license_expression_spdx": "BSD-3-Clause",
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 edf64b51cf2..f815260013a 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
@@ -120,7 +120,7 @@
       "license_expression": "bsd-new",
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
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 11671cc45ec..b4a967037d8 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
@@ -119,7 +119,7 @@
       "license_expression": "bsd-new",
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
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 3793cb30024..fd53323f40a 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
@@ -146,7 +146,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "composer.json",
+              "from_file": "jquery-form-3.51.0/composer.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-spdx-id",
@@ -168,7 +168,7 @@
             {
               "license_expression": "gpl-2.0",
               "spdx_license_expression": "GPL-2.0-only",
-              "from_file": "composer.json",
+              "from_file": "jquery-form-3.51.0/composer.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -249,7 +249,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "package.json",
+              "from_file": "jquery-form-3.51.0/package.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-spdx-id",
@@ -271,7 +271,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "package.json",
+              "from_file": "jquery-form-3.51.0/package.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "2-aho",
@@ -293,7 +293,7 @@
             {
               "license_expression": "gpl-1.0-plus",
               "spdx_license_expression": "GPL-1.0-or-later",
-              "from_file": "package.json",
+              "from_file": "jquery-form-3.51.0/package.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -315,7 +315,7 @@
             {
               "license_expression": "gpl-1.0-plus",
               "spdx_license_expression": "GPL-1.0-or-later",
-              "from_file": "package.json",
+              "from_file": "jquery-form-3.51.0/package.json",
               "start_line": 1,
               "end_line": 1,
               "matcher": "2-aho",
@@ -472,7 +472,7 @@
       "license_expression_spdx": "(MIT OR GPL-2.0-or-later) AND GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR gpl-2.0-plus",
           "license_expression_spdx": "MIT OR GPL-2.0-or-later",
@@ -513,7 +513,7 @@
       "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -537,7 +537,7 @@
       "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -561,7 +561,7 @@
       "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
@@ -585,7 +585,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -609,7 +609,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -633,7 +633,7 @@
       "license_expression_spdx": "MIT OR GPL-2.0-only",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR gpl-2.0",
           "license_expression_spdx": "MIT OR GPL-2.0-only",
@@ -658,7 +658,7 @@
       "license_expression_spdx": "MIT OR GPL-2.0-only",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR gpl-2.0",
           "license_expression_spdx": "MIT OR GPL-2.0-only",
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 f1a511b6aa5..e0f09ad8b67 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
@@ -42,7 +42,7 @@
             {
               "license_expression": "unknown-license-reference",
               "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "from_file": "Fizzler.nuspec",
+              "from_file": "fizzler/Fizzler.nuspec",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -158,7 +158,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -215,7 +215,7 @@
       "license_expression_spdx": "LGPL-2.0-or-later AND GPL-1.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.0-plus",
           "license_expression_spdx": "LGPL-2.0-or-later",
@@ -258,7 +258,7 @@
       "detection_log": [
         "package-unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
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 0a03ef49ed6..44e49003c6b 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
@@ -42,7 +42,7 @@
             {
               "license_expression": "unknown-license-reference",
               "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "from_file": "flutter_paytabs_bridge.podspec",
+              "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -123,7 +123,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -180,7 +180,7 @@
       "license_expression_spdx": "MIT",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 5b02c141258..3ec22e285c8 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "flutter_paytabs_bridge.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
               "matched_text": "license :file = ../LICENSE"
             }
@@ -131,17 +131,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "unknown-license-reference_see_license_at_manifest_1.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown-license-reference_see_license_at_manifest_1.RULE",
                   "matched_text": "license :file = ../LICENSE"
                 }
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 01f35f8116d..aa4ae413b5a 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
@@ -42,7 +42,7 @@
             {
               "license_expression": "zlib",
               "spdx_license_expression": "Zlib",
-              "from_file": "nanopb.podspec",
+              "from_file": "nanopb/nanopb.podspec",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -107,7 +107,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -148,7 +148,7 @@
       "license_expression_spdx": "Zlib",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
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 6e02eed6ee3..96b6c1ff608 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "Zlib",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "zlib",
+              "spdx_license_expression": "Zlib",
+              "from_file": "nanopb/nanopb.podspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "nanopb.podspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "zlib",
-              "spdx_license_expression": "Zlib",
-              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "zlib_in_manifest.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
               "matched_text": ":type = zlib, :file = LICENSE.txt"
             }
@@ -131,17 +131,17 @@
               "license_expression_spdx": "Zlib",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "zlib",
+                  "spdx_license_expression": "Zlib",
+                  "from_file": "nanopb/nanopb.podspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "zlib",
-                  "spdx_license_expression": "Zlib",
-                  "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "zlib_in_manifest.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_in_manifest.RULE",
                   "matched_text": ":type = zlib, :file = LICENSE.txt"
                 }
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 40f7bf0b3cd..62b4e5ef238 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
@@ -54,7 +54,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "PKG-INFO",
+              "from_file": "base-example/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -100,7 +100,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -127,7 +127,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -147,7 +147,7 @@
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
-          "from_file": "PKG-INFO",
+          "from_file": "base-example/PKG-INFO",
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
@@ -323,7 +323,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "PKG-INFO",
+              "from_file": "base-example/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
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 2c9b162ebda..e2610bb2179 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
@@ -4761,7 +4761,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -4786,7 +4786,7 @@
       "license_expression_spdx": "BSD-4-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-original",
           "license_expression_spdx": "BSD-4-Clause",
@@ -4811,7 +4811,7 @@
       "license_expression_spdx": "BSD-2-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-simplified",
           "license_expression_spdx": "BSD-2-Clause",
@@ -4836,7 +4836,7 @@
       "license_expression_spdx": "LicenseRef-scancode-free-unknown",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -4861,7 +4861,7 @@
       "license_expression_spdx": "LicenseRef-scancode-free-unknown",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -4886,7 +4886,7 @@
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 44,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -4911,7 +4911,7 @@
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 42,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -4939,7 +4939,7 @@
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -4964,7 +4964,7 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -5005,7 +5005,7 @@
       "license_expression_spdx": "GPL-2.0-or-later AND LicenseRef-scancode-free-unknown",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -5046,7 +5046,7 @@
       "license_expression_spdx": "GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND MIT AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -5407,7 +5407,7 @@
       "license_expression_spdx": "LGPL-3.0-or-later",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-3.0-plus",
           "license_expression_spdx": "LGPL-3.0-or-later",
@@ -5435,7 +5435,7 @@
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -5463,7 +5463,7 @@
         "possible-false-positive",
         "not-license-clues-as-more-detections-present"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "public-domain",
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
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 35a620740b6..d11187046f0 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
@@ -54,7 +54,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -149,7 +149,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.3/PKG-INFO",
+              "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -195,7 +195,7 @@
       "license_expression_spdx": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND 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",
@@ -220,7 +220,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 6,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -247,7 +247,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -267,7 +267,7 @@
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
-          "from_file": "django-1.2/setup.py",
+          "from_file": "google_appengine_sdk/django-1.2/setup.py",
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
@@ -287,7 +287,7 @@
       "license_expression_spdx": "BSD-3-Clause",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
@@ -314,7 +314,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -334,7 +334,7 @@
         {
           "license_expression": "bsd-new",
           "license_expression_spdx": "BSD-3-Clause",
-          "from_file": "django-1.2/setup.py",
+          "from_file": "google_appengine_sdk/django-1.2/setup.py",
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
@@ -550,7 +550,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -606,7 +606,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -686,7 +686,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -742,7 +742,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -798,7 +798,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.2/setup.py",
+              "from_file": "google_appengine_sdk/django-1.2/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -1387,7 +1387,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.3/PKG-INFO",
+              "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -1467,7 +1467,7 @@
             {
               "license_expression": "bsd-new",
               "spdx_license_expression": "BSD-3-Clause",
-              "from_file": "django-1.3/PKG-INFO",
+              "from_file": "google_appengine_sdk/django-1.3/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
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 5924b7d8e53..0db619f2693 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
@@ -48,7 +48,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -70,7 +70,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -397,7 +397,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -417,7 +417,7 @@
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
-          "from_file": "setup.py",
+          "from_file": "paddlenlp/setup.py",
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
@@ -432,7 +432,7 @@
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
-          "from_file": "setup.py",
+          "from_file": "paddlenlp/setup.py",
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
@@ -452,7 +452,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -479,7 +479,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -520,7 +520,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -545,7 +545,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -570,7 +570,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -595,7 +595,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -619,7 +619,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -660,7 +660,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -896,7 +896,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -911,7 +911,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -967,7 +967,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -982,7 +982,7 @@
             {
               "license_expression": "apache-2.0",
               "spdx_license_expression": "Apache-2.0",
-              "from_file": "setup.py",
+              "from_file": "paddlenlp/setup.py",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
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 40c69009451..0c56f1c8905 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
@@ -8,7 +8,7 @@
       "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0",
           "license_expression_spdx": "GPL-3.0-only",
@@ -35,7 +35,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -158,7 +158,7 @@
       "detection_log": [
         "unknown-reference-in-file-to-nonexistent-package"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -295,7 +295,7 @@
       "license_expression_spdx": "GPL-3.0-only AND LicenseRef-scancode-unknown-license-reference AND GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0",
           "license_expression_spdx": "GPL-3.0-only",
@@ -352,7 +352,7 @@
       "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0-plus",
           "license_expression_spdx": "GPL-3.0-or-later",
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 95d782e06ce..40b58c13169 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
@@ -296,7 +296,7 @@
       "license_expression_spdx": "CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND LicenseRef-scancode-dco-1.1",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc-by-sa-3.0",
           "license_expression_spdx": "CC-BY-SA-3.0",
@@ -353,7 +353,7 @@
       "license_expression_spdx": "GPL-1.0-or-later",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -378,7 +378,7 @@
       "license_expression_spdx": "GPL-1.0-or-later AND LGPL-3.0-or-later AND GPL-3.0-only AND LGPL-3.0-only",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -467,7 +467,7 @@
       "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
@@ -492,7 +492,7 @@
       "license_expression_spdx": "GPL-3.0-only",
       "detection_count": 3,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0",
           "license_expression_spdx": "GPL-3.0-only",
@@ -519,7 +519,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -562,7 +562,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "free-unknown",
           "license_expression_spdx": "LicenseRef-scancode-free-unknown",
@@ -795,7 +795,7 @@
       "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0-plus",
           "license_expression_spdx": "GPL-3.0-or-later",
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 802121c1078..29a176d6f86 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
@@ -126,7 +126,7 @@
       "detection_log": [
         "unknown-reference-to-local-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -163,7 +163,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 ac82dc6c285..028f8291027 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
@@ -239,7 +239,7 @@
       "detection_log": [
         "from-package-file"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -262,7 +262,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -285,7 +285,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -308,7 +308,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -331,7 +331,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -354,7 +354,7 @@
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 1049d5c0360..2a04da3fc50 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
@@ -110,7 +110,7 @@
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
@@ -133,7 +133,7 @@
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
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 1c4838ec7aa..69c6668b68c 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
@@ -586,7 +586,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 4,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -608,7 +608,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -630,7 +630,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -652,7 +652,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
diff --git a/tests/packagedcode/data/npm/electron/package.expected.json b/tests/packagedcode/data/npm/electron/package.expected.json
index 83985823078..ad412285e74 100644
--- a/tests/packagedcode/data/npm/electron/package.expected.json
+++ b/tests/packagedcode/data/npm/electron/package.expected.json
@@ -42,17 +42,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "package/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -229,17 +229,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
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 5e2a4c41213..2c39a3501d6 100644
--- a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json
+++ b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "get_package_resources/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "get_package_resources/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -129,17 +129,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "get_package_resources/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/npm/scan-nested/scan.expected.json b/tests/packagedcode/data/npm/scan-nested/scan.expected.json
index 34f5351c090..8ddfac73427 100644
--- a/tests/packagedcode/data/npm/scan-nested/scan.expected.json
+++ b/tests/packagedcode/data/npm/scan-nested/scan.expected.json
@@ -64,17 +64,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "scan/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -173,17 +173,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "scan/node_modules/sequelize/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/node_modules/sequelize/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -1142,17 +1142,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "scan/node_modules/sequelize/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1812,17 +1812,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "scan/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/about-package-expected.json b/tests/packagedcode/data/plugin/about-package-expected.json
index 78c54d72497..a77b35876b1 100644
--- a/tests/packagedcode/data/plugin/about-package-expected.json
+++ b/tests/packagedcode/data/plugin/about-package-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "aboutfiles/apipkg.ABOUT",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "apipkg.ABOUT",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -117,17 +117,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "aboutfiles/appdirs.ABOUT",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "appdirs.ABOUT",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
               "rule_url": null,
               "matched_text": "mit"
             }
@@ -222,17 +222,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "aboutfiles/apipkg.ABOUT",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
@@ -315,17 +315,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "aboutfiles/appdirs.ABOUT",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
                   "rule_url": null,
                   "matched_text": "mit"
                 }
diff --git a/tests/packagedcode/data/plugin/bower-package-expected.json b/tests/packagedcode/data/plugin/bower-package-expected.json
index 0822c77ef0b..3a49960fc03 100644
--- a/tests/packagedcode/data/plugin/bower-package-expected.json
+++ b/tests/packagedcode/data/plugin/bower-package-expected.json
@@ -44,17 +44,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/bower.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "bower.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -175,17 +175,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/bower.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/cargo-package-expected.json b/tests/packagedcode/data/plugin/cargo-package-expected.json
index 5f237adcd8b..dcd0333054f 100644
--- a/tests/packagedcode/data/plugin/cargo-package-expected.json
+++ b/tests/packagedcode/data/plugin/cargo-package-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/Cargo.toml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Cargo.toml",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -124,17 +124,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/Cargo.toml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json
index 02f362bb98e..f33ecaa8453 100644
--- a/tests/packagedcode/data/plugin/chef-package-expected.json
+++ b/tests/packagedcode/data/plugin/chef-package-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/metadata.rb",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "metadata.rb",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -155,17 +155,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/metadata.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -249,17 +249,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/metadata.rb",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/com-package-expected.json b/tests/packagedcode/data/plugin/com-package-expected.json
index 68d04d9c98d..af222b34921 100644
--- a/tests/packagedcode/data/plugin/com-package-expected.json
+++ b/tests/packagedcode/data/plugin/com-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "chcp.com",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
diff --git a/tests/packagedcode/data/plugin/conda-package-expected.json b/tests/packagedcode/data/plugin/conda-package-expected.json
index 466a6df7ff8..8323e9aea8f 100644
--- a/tests/packagedcode/data/plugin/conda-package-expected.json
+++ b/tests/packagedcode/data/plugin/conda-package-expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
           "matches": [
             {
-              "score": 80.0,
+              "license_expression": "unknown-license-reference",
+              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+              "from_file": "package/info/recipe.tar-extract/recipe/meta.yaml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "info/recipe.tar-extract/recipe/meta.yaml",
+              "matcher": "1-hash",
+              "score": 80.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "unknown-license-reference",
-              "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-              "rule_identifier": "unknown_license_other_12.RULE",
               "rule_relevance": 80,
+              "rule_identifier": "unknown_license_other_12.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_license_other_12.RULE",
               "matched_text": "license Other"
             }
@@ -304,17 +304,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
               "matches": [
                 {
-                  "score": 80.0,
+                  "license_expression": "unknown-license-reference",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
+                  "from_file": "package/info/recipe.tar-extract/recipe/meta.yaml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 80.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "unknown-license-reference",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
-                  "rule_identifier": "unknown_license_other_12.RULE",
                   "rule_relevance": 80,
+                  "rule_identifier": "unknown_license_other_12.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unknown_license_other_12.RULE",
                   "matched_text": "license Other"
                 }
diff --git a/tests/packagedcode/data/plugin/cran-package-expected.json b/tests/packagedcode/data/plugin/cran-package-expected.json
index 598503af1e8..8ff575e1235 100644
--- a/tests/packagedcode/data/plugin/cran-package-expected.json
+++ b/tests/packagedcode/data/plugin/cran-package-expected.json
@@ -47,17 +47,17 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "package/DESCRIPTION",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "DESCRIPTION",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
               "matched_text": "GPL"
             }
@@ -153,17 +153,17 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "package/DESCRIPTION",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
                   "matched_text": "GPL"
                 }
diff --git a/tests/packagedcode/data/plugin/freebsd-package-expected.json b/tests/packagedcode/data/plugin/freebsd-package-expected.json
index f6744b98d00..23d30103356 100644
--- a/tests/packagedcode/data/plugin/freebsd-package-expected.json
+++ b/tests/packagedcode/data/plugin/freebsd-package-expected.json
@@ -45,17 +45,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "package/+COMPACT_MANIFEST",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "+COMPACT_MANIFEST",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
               "matched_text": "GPLv2"
             }
@@ -134,17 +134,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": "package/+COMPACT_MANIFEST",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
                   "matched_text": "GPLv2"
                 }
diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json
index 8e6dc893bb7..ba99fa2ad82 100644
--- a/tests/packagedcode/data/plugin/get_installed_packages-expected.json
+++ b/tests/packagedcode/data/plugin/get_installed_packages-expected.json
@@ -43,17 +43,17 @@
         "license_expression_spdx": "X11-distribute-modifications-variant",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-fsf",
+            "spdx_license_expression": "X11-distribute-modifications-variant",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
             "start_line": 23,
             "end_line": 45,
-            "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 200,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-fsf",
-            "spdx_license_expression": "X11-distribute-modifications-variant",
-            "rule_identifier": "x11-fsf.LICENSE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-fsf.LICENSE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
           }
@@ -65,17 +65,17 @@
         "license_expression_spdx": "X11",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
             "start_line": 50,
             "end_line": 70,
-            "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 201,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-xconsortium",
-            "spdx_license_expression": "X11",
-            "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-xconsortium_2.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
           }
@@ -87,17 +87,17 @@
         "license_expression_spdx": "BSD-3-Clause",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "bsd-new",
+            "spdx_license_expression": "BSD-3-Clause",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
             "start_line": 76,
             "end_line": 98,
-            "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 213,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "bsd-new",
-            "spdx_license_expression": "BSD-3-Clause",
-            "rule_identifier": "bsd-new_19.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "bsd-new_19.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
             "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
           }
@@ -109,17 +109,17 @@
         "license_expression_spdx": "X11",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "x11-xconsortium",
+            "spdx_license_expression": "X11",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
             "start_line": 105,
             "end_line": 127,
-            "from_file": "basic-rootfs.tar.gz/var/lib/dpkg/status",
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 199,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "x11-xconsortium",
-            "spdx_license_expression": "X11",
-            "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
           }
@@ -227,17 +227,17 @@
                 "license_expression_spdx": "X11-distribute-modifications-variant",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-fsf",
+                    "spdx_license_expression": "X11-distribute-modifications-variant",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                     "start_line": 23,
                     "end_line": 45,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 200,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-fsf",
-                    "spdx_license_expression": "X11-distribute-modifications-variant",
-                    "rule_identifier": "x11-fsf.LICENSE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-fsf.LICENSE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/x11-fsf.LICENSE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, distribute with modifications, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,\nDAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\nOTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR\nTHE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                   }
@@ -249,17 +249,17 @@
                 "license_expression_spdx": "X11",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                     "start_line": 50,
                     "end_line": 70,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 201,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-xconsortium",
-                    "spdx_license_expression": "X11",
-                    "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-xconsortium_2.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_2.RULE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to\ndeal in the Software without restriction, including without limitation the\nrights to use, copy, modify, merge, publish, distribute, sublicense, and/or\nsell copies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\nX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-\nTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name of the X Consortium shall not\nbe used in advertising or otherwise to promote the sale, use or other deal-\nings in this Software without prior written authorization from the X Consor-\ntium."
                   }
@@ -271,17 +271,17 @@
                 "license_expression_spdx": "BSD-3-Clause",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "bsd-new",
+                    "spdx_license_expression": "BSD-3-Clause",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                     "start_line": 76,
                     "end_line": 98,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 213,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "bsd-new",
-                    "spdx_license_expression": "BSD-3-Clause",
-                    "rule_identifier": "bsd-new_19.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "bsd-new_19.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_19.RULE",
                     "matched_text": "Redistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions\nare met:\n1. Redistributions of source code must retain the above copyright\n   notice, this list of conditions and the following disclaimer.\n2. Redistributions in binary form must reproduce the above copyright\n   notice, this list of conditions and the following disclaimer in the\n   documentation and/or other materials provided with the distribution.\n3. Neither the name of the University nor the names of its contributors\n   may be used to endorse or promote products derived from this software\n   without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\nARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\nOR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\nHOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\nLIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\nOUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGE."
                   }
@@ -293,17 +293,17 @@
                 "license_expression_spdx": "X11",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "x11-xconsortium",
+                    "spdx_license_expression": "X11",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright",
                     "start_line": 105,
                     "end_line": 127,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 199,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "x11-xconsortium",
-                    "spdx_license_expression": "X11",
-                    "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                   }
@@ -473,47 +473,47 @@
         "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
         "matches": [
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
             "start_line": 13,
             "end_line": 13,
-            "from_file": null,
+            "matcher": "1-hash",
+            "score": 100.0,
             "matched_length": 4,
             "match_coverage": 100.0,
-            "matcher": "1-hash",
-            "license_expression": "lgpl-2.1-plus",
-            "spdx_license_expression": "LGPL-2.1-or-later",
-            "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1-plus_108.RULE",
             "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+"
           },
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1-plus",
+            "spdx_license_expression": "LGPL-2.1-or-later",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
             "start_line": 14,
             "end_line": 26,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 117,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-2.1-plus",
-            "spdx_license_expression": "LGPL-2.1-or-later",
-            "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1-plus_93.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
             "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
           },
           {
-            "score": 100.0,
+            "license_expression": "lgpl-2.1",
+            "spdx_license_expression": "LGPL-2.1-only",
+            "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
             "start_line": 24,
             "end_line": 30,
-            "from_file": null,
+            "matcher": "2-aho",
+            "score": 100.0,
             "matched_length": 64,
             "match_coverage": 100.0,
-            "matcher": "2-aho",
-            "license_expression": "lgpl-2.1",
-            "spdx_license_expression": "LGPL-2.1-only",
-            "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_relevance": 100,
+            "rule_identifier": "lgpl-2.1_314.RULE",
             "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
             "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
           }
@@ -603,47 +603,47 @@
                 "license_expression_spdx": "LGPL-2.1-or-later AND LGPL-2.1-only",
                 "matches": [
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                     "start_line": 13,
                     "end_line": 13,
-                    "from_file": null,
+                    "matcher": "1-hash",
+                    "score": 100.0,
                     "matched_length": 4,
                     "match_coverage": 100.0,
-                    "matcher": "1-hash",
-                    "license_expression": "lgpl-2.1-plus",
-                    "spdx_license_expression": "LGPL-2.1-or-later",
-                    "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1-plus_108.RULE",
                     "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+"
                   },
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1-plus",
+                    "spdx_license_expression": "LGPL-2.1-or-later",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                     "start_line": 14,
                     "end_line": 26,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 117,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "lgpl-2.1-plus",
-                    "spdx_license_expression": "LGPL-2.1-or-later",
-                    "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1-plus_93.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_93.RULE",
                     "matched_text": "This program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU Lesser General Public License as published\nby the Free Software Foundation; either version 2.1 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
                   },
                   {
-                    "score": 100.0,
+                    "license_expression": "lgpl-2.1",
+                    "spdx_license_expression": "LGPL-2.1-only",
+                    "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright",
                     "start_line": 24,
                     "end_line": 30,
-                    "from_file": null,
+                    "matcher": "2-aho",
+                    "score": 100.0,
                     "matched_length": 64,
                     "match_coverage": 100.0,
-                    "matcher": "2-aho",
-                    "license_expression": "lgpl-2.1",
-                    "spdx_license_expression": "LGPL-2.1-only",
-                    "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_relevance": 100,
+                    "rule_identifier": "lgpl-2.1_314.RULE",
                     "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_314.RULE",
                     "matched_text": "You should have received a copy of the GNU Lesser General Public License\nalong with this program; if not, write to the Free Software Foundation,\nInc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n\nOn Debian systems, the full text of the GNU Lesser General Public\nLicense version 2.1 can be found in the file\n`/usr/share/common-licenses/LGPL-2.1'."
                   }
diff --git a/tests/packagedcode/data/plugin/haxe-package-expected.json b/tests/packagedcode/data/plugin/haxe-package-expected.json
index 9feddd07c2e..d76124221ae 100644
--- a/tests/packagedcode/data/plugin/haxe-package-expected.json
+++ b/tests/packagedcode/data/plugin/haxe-package-expected.json
@@ -45,17 +45,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/haxelib.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "haxelib.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -134,17 +134,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/haxelib.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json
index 7b40de3743a..089c50f0bfe 100644
--- a/tests/packagedcode/data/plugin/maven-package-expected.json
+++ b/tests/packagedcode/data/plugin/maven-package-expected.json
@@ -224,32 +224,32 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "aopalliance-1.0/aopalliance-1.0.pom",
+              "matcher": "2-aho",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "- name: Public Domain"
             },
             {
-              "score": 50.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "aopalliance-1.0/aopalliance-1.0.pom",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
               "matched_text": "- name: GPL"
             }
@@ -758,17 +758,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "commons-validator-1.2.0/commons-validator-1.2.0.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1316.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1316.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0"
             }
@@ -990,17 +990,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_1160.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_1160.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
               "matched_text": "license - name: MIT"
             }
@@ -1165,32 +1165,32 @@
           "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
+              "from_file": "maven2/foo-pom/foo-pom.xml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "foo-pom/foo-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "epl-1.0",
-              "spdx_license_expression": "EPL-1.0",
-              "rule_identifier": "epl-1.0_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "epl-1.0_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
               "matched_text": "- name: Eclipse Public License - v 1.0"
             },
             {
-              "score": 100.0,
+              "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
+              "from_file": "maven2/foo-pom/foo-pom.xml",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "foo-pom/foo-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "epl-1.0",
-              "spdx_license_expression": "EPL-1.0",
-              "rule_identifier": "epl-1.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "epl-1.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
               "matched_text": "  url: http://www.eclipse.org/legal/epl-v10.html"
             }
@@ -1384,32 +1384,32 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 75.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
+              "matcher": "2-aho",
+              "score": 75.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_relevance": 75,
+              "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
               "matched_text": "- name: LGPL"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
               "matched_text": "  url: http://www.gnu.org/copyleft/lesser.html"
             }
@@ -1478,17 +1478,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/log4j/log4j-pom.xml",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "log4j/log4j-pom.xml",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -1549,32 +1549,32 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/logback-access/logback-access.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "logback-access/logback-access.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
               "matched_text": "- name: GNU Lesser General Public License"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/logback-access/logback-access.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "logback-access/logback-access.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
               "matched_text": "  url: http://www.gnu.org/licenses/lgpl.html"
             }
@@ -2038,17 +2038,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-2.5.4/spring-2.5.4.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -2117,17 +2117,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-orm-2.5.3/spring-orm-2.5.3.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -2196,17 +2196,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -6659,32 +6659,32 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "- name: Public Domain"
                 },
                 {
-                  "score": 50.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 50.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
                   "matched_text": "- name: GPL"
                 }
@@ -7346,17 +7346,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0"
                 }
@@ -7919,17 +7919,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_1160.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_1160.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
                   "matched_text": "license - name: MIT"
                 }
@@ -8416,32 +8416,32 @@
               "license_expression_spdx": "EPL-1.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
+                  "from_file": "maven2/foo-pom/foo-pom.xml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 6,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "epl-1.0",
-                  "spdx_license_expression": "EPL-1.0",
-                  "rule_identifier": "epl-1.0_4.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "epl-1.0_4.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
                   "matched_text": "- name: Eclipse Public License - v 1.0"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
+                  "from_file": "maven2/foo-pom/foo-pom.xml",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "epl-1.0",
-                  "spdx_license_expression": "EPL-1.0",
-                  "rule_identifier": "epl-1.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "epl-1.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
                   "matched_text": "  url: http://www.eclipse.org/legal/epl-v10.html"
                 }
@@ -8867,32 +8867,32 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
               "matches": [
                 {
-                  "score": 75.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 75.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_relevance": 75,
+                  "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
                   "matched_text": "- name: LGPL"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl_7.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl_7.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
                   "matched_text": "  url: http://www.gnu.org/copyleft/lesser.html"
                 }
@@ -9035,17 +9035,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/log4j/log4j-pom.xml",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -9200,32 +9200,32 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/logback-access/logback-access.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
                   "matched_text": "- name: GNU Lesser General Public License"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/logback-access/logback-access.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl_3.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl_3.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
                   "matched_text": "  url: http://www.gnu.org/licenses/lgpl.html"
                 }
@@ -10496,17 +10496,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -11259,17 +11259,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -11532,17 +11532,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
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 7b40de3743a..089c50f0bfe 100644
--- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json
+++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json
@@ -224,32 +224,32 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "aopalliance-1.0/aopalliance-1.0.pom",
+              "matcher": "2-aho",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "- name: Public Domain"
             },
             {
-              "score": 50.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "aopalliance-1.0/aopalliance-1.0.pom",
+              "matcher": "2-aho",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
               "matched_text": "- name: GPL"
             }
@@ -758,17 +758,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "commons-validator-1.2.0/commons-validator-1.2.0.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_1316.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_1316.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0"
             }
@@ -990,17 +990,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "mit_1160.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "mit_1160.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
               "matched_text": "license - name: MIT"
             }
@@ -1165,32 +1165,32 @@
           "license_expression_spdx": "EPL-1.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
+              "from_file": "maven2/foo-pom/foo-pom.xml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "foo-pom/foo-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 6,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "epl-1.0",
-              "spdx_license_expression": "EPL-1.0",
-              "rule_identifier": "epl-1.0_4.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "epl-1.0_4.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
               "matched_text": "- name: Eclipse Public License - v 1.0"
             },
             {
-              "score": 100.0,
+              "license_expression": "epl-1.0",
+              "spdx_license_expression": "EPL-1.0",
+              "from_file": "maven2/foo-pom/foo-pom.xml",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "foo-pom/foo-pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 8,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "epl-1.0",
-              "spdx_license_expression": "EPL-1.0",
-              "rule_identifier": "epl-1.0.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "epl-1.0.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
               "matched_text": "  url: http://www.eclipse.org/legal/epl-v10.html"
             }
@@ -1384,32 +1384,32 @@
           "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
           "matches": [
             {
-              "score": 75.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
+              "matcher": "2-aho",
+              "score": 75.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_relevance": 75,
+              "rule_identifier": "lgpl_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
               "matched_text": "- name: LGPL"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.1-plus",
+              "spdx_license_expression": "LGPL-2.1-or-later",
+              "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.1-plus",
-              "spdx_license_expression": "LGPL-2.1-or-later",
-              "rule_identifier": "lgpl_7.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl_7.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
               "matched_text": "  url: http://www.gnu.org/copyleft/lesser.html"
             }
@@ -1478,17 +1478,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/log4j/log4j-pom.xml",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "log4j/log4j-pom.xml",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -1549,32 +1549,32 @@
           "license_expression_spdx": "LGPL-2.0-or-later",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/logback-access/logback-access.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "logback-access/logback-access.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl-2.0-plus_87.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
               "matched_text": "- name: GNU Lesser General Public License"
             },
             {
-              "score": 100.0,
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "maven2/logback-access/logback-access.pom",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "logback-access/logback-access.pom",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 7,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "lgpl-2.0-plus",
-              "spdx_license_expression": "LGPL-2.0-or-later",
-              "rule_identifier": "lgpl_3.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "lgpl_3.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
               "matched_text": "  url: http://www.gnu.org/licenses/lgpl.html"
             }
@@ -2038,17 +2038,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-2.5.4/spring-2.5.4.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -2117,17 +2117,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-orm-2.5.3/spring-orm-2.5.3.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -2196,17 +2196,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
               "start_line": 1,
               "end_line": 2,
-              "from_file": "spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 18,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_40.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_40.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
               "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -6659,32 +6659,32 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain AND GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "- name: Public Domain"
                 },
                 {
-                  "score": 50.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 50.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
                   "matched_text": "- name: GPL"
                 }
@@ -7346,17 +7346,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_1316.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1316.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0"
                 }
@@ -7919,17 +7919,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_1160.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_1160.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1160.RULE",
                   "matched_text": "license - name: MIT"
                 }
@@ -8416,32 +8416,32 @@
               "license_expression_spdx": "EPL-1.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
+                  "from_file": "maven2/foo-pom/foo-pom.xml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 6,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "epl-1.0",
-                  "spdx_license_expression": "EPL-1.0",
-                  "rule_identifier": "epl-1.0_4.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "epl-1.0_4.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0_4.RULE",
                   "matched_text": "- name: Eclipse Public License - v 1.0"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "epl-1.0",
+                  "spdx_license_expression": "EPL-1.0",
+                  "from_file": "maven2/foo-pom/foo-pom.xml",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "epl-1.0",
-                  "spdx_license_expression": "EPL-1.0",
-                  "rule_identifier": "epl-1.0.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "epl-1.0.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/epl-1.0.RULE",
                   "matched_text": "  url: http://www.eclipse.org/legal/epl-v10.html"
                 }
@@ -8867,32 +8867,32 @@
               "license_expression_spdx": "LGPL-2.0-or-later AND LGPL-2.1-or-later",
               "matches": [
                 {
-                  "score": 75.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 75.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_relevance": 75,
+                  "rule_identifier": "lgpl_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_bare_single_word.RULE",
                   "matched_text": "- name: LGPL"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.1-plus",
+                  "spdx_license_expression": "LGPL-2.1-or-later",
+                  "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.1-plus",
-                  "spdx_license_expression": "LGPL-2.1-or-later",
-                  "rule_identifier": "lgpl_7.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl_7.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_7.RULE",
                   "matched_text": "  url: http://www.gnu.org/copyleft/lesser.html"
                 }
@@ -9035,17 +9035,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/log4j/log4j-pom.xml",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -9200,32 +9200,32 @@
               "license_expression_spdx": "LGPL-2.0-or-later",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/logback-access/logback-access.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl-2.0-plus_87.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_87.RULE",
                   "matched_text": "- name: GNU Lesser General Public License"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "lgpl-2.0-plus",
+                  "spdx_license_expression": "LGPL-2.0-or-later",
+                  "from_file": "maven2/logback-access/logback-access.pom",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 7,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "lgpl-2.0-plus",
-                  "spdx_license_expression": "LGPL-2.0-or-later",
-                  "rule_identifier": "lgpl_3.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "lgpl_3.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_3.RULE",
                   "matched_text": "  url: http://www.gnu.org/licenses/lgpl.html"
                 }
@@ -10496,17 +10496,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -11259,17 +11259,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
@@ -11532,17 +11532,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom",
                   "start_line": 1,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 18,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_40.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_40.RULE",
                   "matched_text": "- name: The Apache Software License, Version 2.0\n  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
diff --git a/tests/packagedcode/data/plugin/mui-package-expected.json b/tests/packagedcode/data/plugin/mui-package-expected.json
index ef193e19a2b..90a0506b130 100644
--- a/tests/packagedcode/data/plugin/mui-package-expected.json
+++ b/tests/packagedcode/data/plugin/mui-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "clfs.sys.mui",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
diff --git a/tests/packagedcode/data/plugin/mun-package-expected.json b/tests/packagedcode/data/plugin/mun-package-expected.json
index 31450754a64..dfc7072e1c0 100644
--- a/tests/packagedcode/data/plugin/mun-package-expected.json
+++ b/tests/packagedcode/data/plugin/mun-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "crypt32.dll.mun",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
diff --git a/tests/packagedcode/data/plugin/nuget-package-expected.json b/tests/packagedcode/data/plugin/nuget-package-expected.json
index b6dde160863..03a66ed0f5b 100644
--- a/tests/packagedcode/data/plugin/nuget-package-expected.json
+++ b/tests/packagedcode/data/plugin/nuget-package-expected.json
@@ -47,17 +47,17 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "package/Castle.Core.nuspec",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Castle.Core.nuspec",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_20.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_20.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_20.RULE",
               "matched_text": "http://www.apache.org/licenses/LICENSE-2.0.html"
             }
@@ -309,17 +309,17 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "package/Castle.Core.nuspec",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_20.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_20.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_20.RULE",
                   "matched_text": "http://www.apache.org/licenses/LICENSE-2.0.html"
                 }
diff --git a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
index 88109ed6f35..3fbaeb4aecd 100644
--- a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
+++ b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json
@@ -47,17 +47,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/composer.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "composer.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -181,17 +181,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/composer.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/python-package-expected.json b/tests/packagedcode/data/plugin/python-package-expected.json
index f54a9fdc124..8917e1964b7 100644
--- a/tests/packagedcode/data/plugin/python-package-expected.json
+++ b/tests/packagedcode/data/plugin/python-package-expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "BSD-2-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-simplified",
+              "spdx_license_expression": "BSD-2-Clause",
+              "from_file": "pypi/arpy/setup.py",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "arpy/setup.py",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-simplified",
-              "spdx_license_expression": "BSD-2-Clause",
-              "rule_identifier": "bsd-simplified_150.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-simplified_150.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
               "matched_text": "Simplified BSD"
             }
@@ -125,17 +125,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -147,17 +147,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -216,17 +216,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi/Six/metadata.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Six/metadata.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -299,17 +299,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi/Six/Six.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Six/Six.dist-info/METADATA",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -321,17 +321,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pypi/Six/Six.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "Six/Six.dist-info/METADATA",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -398,17 +398,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "pypi/TicketImport/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "TicketImport/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -823,17 +823,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi/Six/Six.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -845,17 +845,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi/Six/Six.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -920,17 +920,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi/Six/metadata.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1010,17 +1010,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "pypi/TicketImport/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -1100,17 +1100,17 @@
               "license_expression_spdx": "BSD-2-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-simplified",
+                  "spdx_license_expression": "BSD-2-Clause",
+                  "from_file": "pypi/arpy/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-simplified",
-                  "spdx_license_expression": "BSD-2-Clause",
-                  "rule_identifier": "bsd-simplified_150.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-simplified_150.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_150.RULE",
                   "matched_text": "Simplified BSD"
                 }
@@ -1419,17 +1419,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -1441,17 +1441,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
diff --git a/tests/packagedcode/data/plugin/rpm-package-expected.json b/tests/packagedcode/data/plugin/rpm-package-expected.json
index dd53afbb191..353f21d6dfd 100644
--- a/tests/packagedcode/data/plugin/rpm-package-expected.json
+++ b/tests/packagedcode/data/plugin/rpm-package-expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "GPL-1.0-or-later",
           "matches": [
             {
-              "score": 50.0,
+              "license_expression": "gpl-1.0-plus",
+              "spdx_license_expression": "GPL-1.0-or-later",
+              "from_file": "package/alfandega-2.0-1.7.3.noarch.rpm",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "alfandega-2.0-1.7.3.noarch.rpm",
+              "matcher": "1-hash",
+              "score": 50.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-1.0-plus",
-              "spdx_license_expression": "GPL-1.0-or-later",
-              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_relevance": 50,
+              "rule_identifier": "gpl_bare_word_only.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
               "matched_text": "GPL"
             }
@@ -110,17 +110,17 @@
               "license_expression_spdx": "GPL-1.0-or-later",
               "matches": [
                 {
-                  "score": 50.0,
+                  "license_expression": "gpl-1.0-plus",
+                  "spdx_license_expression": "GPL-1.0-or-later",
+                  "from_file": "package/alfandega-2.0-1.7.3.noarch.rpm",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 50.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-1.0-plus",
-                  "spdx_license_expression": "GPL-1.0-or-later",
-                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_relevance": 50,
+                  "rule_identifier": "gpl_bare_word_only.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_bare_word_only.RULE",
                   "matched_text": "GPL"
                 }
diff --git a/tests/packagedcode/data/plugin/rubygems-package-expected.json b/tests/packagedcode/data/plugin/rubygems-package-expected.json
index 1254c8adf9e..7f5c3717e1f 100644
--- a/tests/packagedcode/data/plugin/rubygems-package-expected.json
+++ b/tests/packagedcode/data/plugin/rubygems-package-expected.json
@@ -61,17 +61,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "package/m2r-2.1.0.gem",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "m2r-2.1.0.gem",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -349,17 +349,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "package/m2r-2.1.0.gem",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/plugin/sys-package-expected.json b/tests/packagedcode/data/plugin/sys-package-expected.json
index fed46ade66f..24053b6b661 100644
--- a/tests/packagedcode/data/plugin/sys-package-expected.json
+++ b/tests/packagedcode/data/plugin/sys-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "tbs.sys",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
diff --git a/tests/packagedcode/data/plugin/tlb-package-expected.json b/tests/packagedcode/data/plugin/tlb-package-expected.json
index 317e7f26d37..3d018a9af07 100644
--- a/tests/packagedcode/data/plugin/tlb-package-expected.json
+++ b/tests/packagedcode/data/plugin/tlb-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "stdole2.tlb",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
diff --git a/tests/packagedcode/data/plugin/win_pe-package-expected.json b/tests/packagedcode/data/plugin/win_pe-package-expected.json
index 639fb0552cb..47f13396e18 100644
--- a/tests/packagedcode/data/plugin/win_pe-package-expected.json
+++ b/tests/packagedcode/data/plugin/win_pe-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-bsd-simplified-darwin",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-simplified-darwin",
+                  "spdx_license_expression": "LicenseRef-scancode-bsd-simplified-darwin",
+                  "from_file": "file.exe",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 217,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "bsd-simplified-darwin",
-                  "spdx_license_expression": "LicenseRef-scancode-bsd-simplified-darwin",
-                  "rule_identifier": "bsd-simplified-darwin.LICENSE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-simplified-darwin.LICENSE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/bsd-simplified-darwin.LICENSE",
                   "matched_text": "Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. Software written by Ian F. Darwin and others; maintained 1994-2004 Christos Zoulas. This software is not subject to any export provision of the United States Department of Commerce, and may be exported to any country or planet. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice immediately at the beginning of the file, without modification, this list of conditions, and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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."
                 }
diff --git a/tests/packagedcode/data/plugin/winmd-package-expected.json b/tests/packagedcode/data/plugin/winmd-package-expected.json
index 3f69a9f947e..614c5566bfb 100644
--- a/tests/packagedcode/data/plugin/winmd-package-expected.json
+++ b/tests/packagedcode/data/plugin/winmd-package-expected.json
@@ -46,17 +46,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 88.89,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "Windows.AI.winmd",
                   "start_line": 1,
                   "end_line": 3,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 88.89,
                   "matched_length": 8,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-ac5b72bda2754025edd093f0f8161168689d3065",
                   "matched_text": "license LegalCopyright: \u00a9 Microsoft Corporation. All rights reserved.\nLegalTrademarks:\nLicense:"
                 }
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 47634958855..af0856664be 100644
--- a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json
+++ b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json
@@ -43,17 +43,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "codebase/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -132,17 +132,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 3,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_10.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "bsd-new_10.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
               "matched_text": "BSD-3-Clause"
             }
@@ -154,17 +154,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -276,17 +276,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "codebase/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -424,17 +424,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 3,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "bsd-new_10.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_10.RULE",
                   "matched_text": "BSD-3-Clause"
                 }
@@ -446,17 +446,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -1017,17 +1017,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "codebase/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json
index e6f1639ec54..ec19c881b77 100644
--- a/tests/packagedcode/data/pypi/solo-metadata/expected.json
+++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json
@@ -180,7 +180,7 @@
                 {
                   "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",
-                  "from_file": null,
+                  "from_file": "PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
diff --git a/tests/packagedcode/data/pypi/solo-setup/expected.json b/tests/packagedcode/data/pypi/solo-setup/expected.json
index 43f114edeec..f7f5925f1e4 100644
--- a/tests/packagedcode/data/pypi/solo-setup/expected.json
+++ b/tests/packagedcode/data/pypi/solo-setup/expected.json
@@ -53,17 +53,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "mit_14.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "mit_14.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_14.RULE",
                   "matched_text": "MIT license"
                 }
@@ -75,17 +75,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
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 2926c6b8eb7..c6a9cff51f1 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
@@ -53,17 +53,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -75,17 +75,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "PKG-INFO",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -211,17 +211,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -233,17 +233,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -673,17 +673,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -695,17 +695,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
@@ -816,17 +816,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -838,17 +838,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
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 3c2940c532b..143175356d0 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
@@ -59,17 +59,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -81,17 +81,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "setup.py",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
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 41ffab3cc82..d5172b954d6 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
@@ -55,7 +55,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "PKG-INFO",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-spdx-id",
@@ -77,7 +77,7 @@
             {
               "license_expression": "mit",
               "spdx_license_expression": "MIT",
-              "from_file": "PKG-INFO",
+              "from_file": "pip-22.0.4/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
               "matcher": "1-hash",
@@ -123,7 +123,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 5,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -145,7 +145,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -167,7 +167,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -189,7 +189,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -225,7 +225,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -275,7 +275,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -297,7 +297,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 1dddaae592b..1a168dd7a39 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
@@ -56,17 +56,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "celery/celery.egg-info/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "celery/celery.egg-info/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "bsd-new_89.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "bsd-new_89.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
               "matched_text": "license BSD"
             }
@@ -78,17 +78,17 @@
           "license_expression_spdx": "BSD-3-Clause",
           "matches": [
             {
-              "score": 99.0,
+              "license_expression": "bsd-new",
+              "spdx_license_expression": "BSD-3-Clause",
+              "from_file": "celery/celery.egg-info/PKG-INFO",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "celery/celery.egg-info/PKG-INFO",
+              "matcher": "1-hash",
+              "score": 99.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "bsd-new",
-              "spdx_license_expression": "BSD-3-Clause",
-              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_relevance": 99,
+              "rule_identifier": "pypi_bsd_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: BSD License'"
             }
@@ -778,17 +778,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "celery/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -800,17 +800,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "celery/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
@@ -910,17 +910,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "celery/celery.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "bsd-new_89.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_89.RULE",
                   "matched_text": "license BSD"
                 }
@@ -932,17 +932,17 @@
               "license_expression_spdx": "BSD-3-Clause",
               "matches": [
                 {
-                  "score": 99.0,
+                  "license_expression": "bsd-new",
+                  "spdx_license_expression": "BSD-3-Clause",
+                  "from_file": "celery/celery.egg-info/PKG-INFO",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 99.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "bsd-new",
-                  "spdx_license_expression": "BSD-3-Clause",
-                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_relevance": 99,
+                  "rule_identifier": "pypi_bsd_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_bsd_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: BSD License'"
                 }
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 a766e51b365..df96c2a8075 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
@@ -44,17 +44,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -66,17 +66,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "pypi_mit_license.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "pypi_mit_license.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
               "matched_text": "- 'License :: OSI Approved :: MIT License'"
             }
@@ -243,17 +243,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
@@ -265,17 +265,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "pypi_mit_license.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pypi_mit_license.RULE",
                   "matched_text": "- 'License :: OSI Approved :: MIT License'"
                 }
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 12c70eb6244..82c2a7c13bf 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
@@ -217077,7 +217077,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -217442,7 +217442,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -217798,7 +217798,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -217865,7 +217865,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -234601,7 +234601,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -234616,7 +234616,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -234631,7 +234631,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -234698,7 +234698,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -234713,7 +234713,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -234728,7 +234728,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -237676,7 +237676,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -238887,7 +238887,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -239045,7 +239045,7 @@
                 {
                   "license_expression": "zlib",
                   "spdx_license_expression": "Zlib",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -239176,7 +239176,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -239289,7 +239289,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -239627,7 +239627,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -239731,7 +239731,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -239934,7 +239934,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -240047,7 +240047,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -240466,7 +240466,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -240481,7 +240481,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -240639,7 +240639,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -241634,7 +241634,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -241649,7 +241649,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -241798,7 +241798,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -241813,7 +241813,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -241989,7 +241989,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -242075,7 +242075,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -242602,7 +242602,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -242706,7 +242706,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -242819,7 +242819,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -243013,7 +243013,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -243028,7 +243028,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -243204,7 +243204,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -243308,7 +243308,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -243412,7 +243412,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -243552,7 +243552,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -243665,7 +243665,7 @@
                 {
                   "license_expression": "openssl-ssleay",
                   "spdx_license_expression": "OpenSSL",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -243904,7 +243904,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -244026,7 +244026,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -244041,7 +244041,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -244307,7 +244307,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -244420,7 +244420,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -245010,7 +245010,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -245645,7 +245645,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -245660,7 +245660,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -245836,7 +245836,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -245851,7 +245851,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -246153,7 +246153,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -246168,7 +246168,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -246183,7 +246183,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -246377,7 +246377,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -246553,7 +246553,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -246801,7 +246801,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -247166,7 +247166,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -247279,7 +247279,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -247446,7 +247446,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -250646,7 +250646,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -250786,7 +250786,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -250801,7 +250801,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -250914,7 +250914,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -251054,7 +251054,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -251491,7 +251491,7 @@
                 {
                   "license_expression": "unknown",
                   "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "5-undetected",
@@ -251748,7 +251748,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -251852,7 +251852,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -251929,7 +251929,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -254247,7 +254247,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -254262,7 +254262,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -254277,7 +254277,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -254292,7 +254292,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -254405,7 +254405,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -254590,7 +254590,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -254730,7 +254730,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -255003,7 +255003,7 @@
                 {
                   "license_expression": "unknown",
                   "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "5-undetected",
@@ -255070,7 +255070,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -255085,7 +255085,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -255100,7 +255100,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -255115,7 +255115,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -255255,7 +255255,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -255503,7 +255503,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -410839,7 +410839,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -410943,7 +410943,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -412487,7 +412487,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -412502,7 +412502,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -412517,7 +412517,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -412954,7 +412954,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -413202,7 +413202,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -413297,7 +413297,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -413419,7 +413419,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -413577,7 +413577,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -413672,7 +413672,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -413767,7 +413767,7 @@
                 {
                   "license_expression": "lgpl-2.0",
                   "spdx_license_expression": "LGPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -413898,7 +413898,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -413913,7 +413913,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -413928,7 +413928,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -414032,7 +414032,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -414136,7 +414136,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -414258,7 +414258,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -414506,7 +414506,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -415132,7 +415132,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -415147,7 +415147,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -415162,7 +415162,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -415356,7 +415356,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -415451,7 +415451,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -416491,7 +416491,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -417027,7 +417027,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -417104,7 +417104,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -418396,7 +418396,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -418554,7 +418554,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -418739,7 +418739,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -418879,7 +418879,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -418983,7 +418983,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -418998,7 +418998,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -419156,7 +419156,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -419611,7 +419611,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -419751,7 +419751,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -419900,7 +419900,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -420715,7 +420715,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -421116,7 +421116,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -424613,7 +424613,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -424717,7 +424717,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -424732,7 +424732,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -424962,7 +424962,7 @@
                 {
                   "license_expression": "lgpl-2.0",
                   "spdx_license_expression": "LGPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -425300,7 +425300,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -425467,7 +425467,7 @@
                 {
                   "license_expression": "unknown",
                   "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "5-undetected",
@@ -425562,7 +425562,7 @@
                 {
                   "license_expression": "mpl-2.0",
                   "spdx_license_expression": "MPL-2.0",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -425666,7 +425666,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -425779,7 +425779,7 @@
                 {
                   "license_expression": "lgpl-3.0-plus",
                   "spdx_license_expression": "LGPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -425892,7 +425892,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -426041,7 +426041,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -426181,7 +426181,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -426330,7 +426330,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -426479,7 +426479,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -426494,7 +426494,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -426509,7 +426509,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -427360,7 +427360,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -427725,7 +427725,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -427829,7 +427829,7 @@
                 {
                   "license_expression": "mit",
                   "spdx_license_expression": "MIT",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-spdx-id",
@@ -428023,7 +428023,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -428038,7 +428038,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -428151,7 +428151,7 @@
                 {
                   "license_expression": "bsd-new",
                   "spdx_license_expression": "BSD-3-Clause",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -428273,7 +428273,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -429511,7 +429511,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -429624,7 +429624,7 @@
                 {
                   "license_expression": "gpl-3.0-plus",
                   "spdx_license_expression": "GPL-3.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "1-hash",
@@ -429737,7 +429737,7 @@
                 {
                   "license_expression": "gpl-2.0",
                   "spdx_license_expression": "GPL-2.0-only",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -429752,7 +429752,7 @@
                 {
                   "license_expression": "gpl-2.0-plus",
                   "spdx_license_expression": "GPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -429767,7 +429767,7 @@
                 {
                   "license_expression": "lgpl-2.0-plus",
                   "spdx_license_expression": "LGPL-2.0-or-later",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
@@ -429782,7 +429782,7 @@
                 {
                   "license_expression": "public-domain",
                   "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "from_file": null,
+                  "from_file": "rootfs/var/lib/rpm/Packages",
                   "start_line": 1,
                   "end_line": 1,
                   "matcher": "2-aho",
diff --git a/tests/packagedcode/test_license_detection.py b/tests/packagedcode/test_license_detection.py
index 58424092c22..ffced68a1fc 100644
--- a/tests/packagedcode/test_license_detection.py
+++ b/tests/packagedcode/test_license_detection.py
@@ -19,7 +19,7 @@
 test_env.test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
 
-def test_license_reference_detection_in_manifest_unknown():
+def test_license_reference_detection_in_manifest_unknown_with_license():
     test_dir = test_env.get_test_loc('license_detection/reference-at-manifest/flutter_playtabs_bridge/', copy=True)
     result_file = test_env.get_temp_file('json')
     args = [
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 865eb927e4c..1aa28272bca 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -40,17 +40,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "composer.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "composer.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -237,17 +237,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "composer.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json
index cebd06a85be..31ff697c27b 100644
--- a/tests/scancode/data/info/all.expected.json
+++ b/tests/scancode/data/info/all.expected.json
@@ -5,7 +5,7 @@
       "license_expression": "bsd-original-uc",
       "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-original-uc",
           "license_expression_spdx": "BSD-4-Clause-UC",
@@ -27,7 +27,7 @@
       "license_expression": "gpl-2.0 OR bsd-new",
       "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json
index ce4117b3438..cb95d6da511 100644
--- a/tests/scancode/data/info/all.rooted.expected.json
+++ b/tests/scancode/data/info/all.rooted.expected.json
@@ -5,7 +5,7 @@
       "license_expression": "bsd-original-uc",
       "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-original-uc",
           "license_expression_spdx": "BSD-4-Clause-UC",
@@ -27,7 +27,7 @@
       "license_expression": "gpl-2.0 OR bsd-new",
       "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected
index c4b4b9fb3bd..f604590b325 100644
--- a/tests/scancode/data/license_text/test.expected
+++ b/tests/scancode/data/license_text/test.expected
@@ -6,7 +6,7 @@
       "license_expression_spdx": "LGPL-2.1-only",
       "detection_count": 1,
       "detection_log": [],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1",
           "license_expression_spdx": "LGPL-2.1-only",
diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json
index 25a19d1037b..ccb240aca46 100644
--- a/tests/scancode/data/plugin_only_findings/basic.expected.json
+++ b/tests/scancode/data/plugin_only_findings/basic.expected.json
@@ -7,7 +7,7 @@
       "license_expression": "bsd-original-uc",
       "license_expression_spdx": "BSD-4-Clause-UC",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "bsd-original-uc",
           "license_expression_spdx": "BSD-4-Clause-UC",
@@ -29,7 +29,7 @@
       "license_expression": "gpl-2.0 OR bsd-new",
       "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0 OR bsd-new",
           "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause",
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 38c55cddce4..eed438c2107 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
@@ -40,17 +40,17 @@
           "license_expression_spdx": "LicenseRef-scancode-unknown",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "unknown",
+              "spdx_license_expression": "LicenseRef-scancode-unknown",
+              "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm",
+              "matcher": "5-undetected",
+              "score": 100.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "5-undetected",
-              "license_expression": "unknown",
-              "spdx_license_expression": "LicenseRef-scancode-unknown",
-              "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
               "rule_relevance": 100,
+              "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
               "matched_text": "license distributable"
             }
@@ -126,17 +126,17 @@
               "license_expression_spdx": "LicenseRef-scancode-unknown",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "unknown",
+                  "spdx_license_expression": "LicenseRef-scancode-unknown",
+                  "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "5-undetected",
+                  "score": 100.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "5-undetected",
-                  "license_expression": "unknown",
-                  "spdx_license_expression": "LicenseRef-scancode-unknown",
-                  "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
                   "rule_relevance": 100,
+                  "rule_identifier": "package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-195220dbe86398dd9a8e945a50757302c09fb0dc",
                   "matched_text": "license distributable"
                 }
diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json
index 3ef7955cd12..9c844445167 100644
--- a/tests/summarycode/data/classify/with_package_data.expected.json
+++ b/tests/summarycode/data/classify/with_package_data.expected.json
@@ -32,32 +32,32 @@
           "license_expression_spdx": "Apache-2.0",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 5,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_48.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_48.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
               "matched_text": "- name: Apache License, version 2.0"
             },
             {
-              "score": 100.0,
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
               "start_line": 2,
               "end_line": 2,
-              "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
+              "matcher": "2-aho",
+              "score": 100.0,
               "matched_length": 9,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "apache-2.0",
-              "spdx_license_expression": "Apache-2.0",
-              "rule_identifier": "apache-2.0_42.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "apache-2.0_42.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
               "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
@@ -656,32 +656,32 @@
               "license_expression_spdx": "Apache-2.0",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 5,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_48.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_48.RULE",
                   "matched_text": "- name: Apache License, version 2.0"
                 },
                 {
-                  "score": 100.0,
+                  "license_expression": "apache-2.0",
+                  "spdx_license_expression": "Apache-2.0",
+                  "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml",
                   "start_line": 2,
                   "end_line": 2,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 100.0,
                   "matched_length": 9,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "apache-2.0",
-                  "spdx_license_expression": "Apache-2.0",
-                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "apache-2.0_42.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_42.RULE",
                   "matched_text": "  url: http://www.apache.org/licenses/LICENSE-2.0.txt"
                 }
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 4d490e6a5ec..50a4552be07 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json
@@ -123,7 +123,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 5,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -145,7 +145,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -167,7 +167,7 @@
       "license_expression": "gpl-2.0",
       "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
@@ -189,7 +189,7 @@
       "license_expression": "lgpl-2.0",
       "license_expression_spdx": "LGPL-2.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.0",
           "license_expression_spdx": "LGPL-2.0-only",
diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
index 5455c92c76f..c9eb2a724fa 100644
--- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json
@@ -77,7 +77,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 5,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -99,7 +99,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -121,7 +121,7 @@
       "license_expression": "gpl-2.0",
       "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
@@ -143,7 +143,7 @@
       "license_expression": "lgpl-2.0",
       "license_expression_spdx": "LGPL-2.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.0",
           "license_expression_spdx": "LGPL-2.0-only",
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 d6c01a8aff5..1ce37ee5643 100644
--- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json
@@ -7,7 +7,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -43,7 +43,7 @@
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
       "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
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 dc522e6c62c..738de8695cd 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
@@ -7,7 +7,7 @@
       "license_expression": "gpl-2.0",
       "license_expression_spdx": "GPL-2.0-only",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0",
           "license_expression_spdx": "GPL-2.0-only",
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 0eccbc7c8d2..0fd1104ee13 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
@@ -77,7 +77,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 6,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -99,7 +99,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
index acad10eaf2d..e7577a3fdb0 100644
--- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json
@@ -77,7 +77,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 4,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -99,7 +99,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
index 26326e38a99..ef1f04428e3 100644
--- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
+++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json
@@ -77,7 +77,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -99,7 +99,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 b68d14b51a8..96885a9491f 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
@@ -7,7 +7,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 4,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 b5c0c035f49..6c60674fa11 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
@@ -7,7 +7,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -43,7 +43,7 @@
       "license_expression": "gpl-1.0-plus AND gpl-2.0",
       "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json
index cc6d7cf8c82..2ff869fe2ca 100644
--- a/tests/summarycode/data/score/basic-expected.json
+++ b/tests/summarycode/data/score/basic-expected.json
@@ -280,7 +280,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -302,7 +302,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -324,7 +324,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
index 72c47c21edf..392f6170054 100644
--- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
+++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json
@@ -280,7 +280,7 @@
       "license_expression": "gpl-2.0-plus",
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -302,7 +302,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -324,7 +324,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -346,7 +346,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json
index cbc93959540..4d8ecd90aa4 100644
--- a/tests/summarycode/data/score/jar-expected.json
+++ b/tests/summarycode/data/score/jar-expected.json
@@ -233,7 +233,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -255,7 +255,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -277,7 +277,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -299,7 +299,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json
index 18724605861..478adb3be97 100644
--- a/tests/summarycode/data/score/no_license_ambiguity-expected.json
+++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json
@@ -104,7 +104,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -126,7 +126,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -162,7 +162,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR apache-2.0",
           "license_expression_spdx": "MIT OR Apache-2.0",
@@ -212,7 +212,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -234,7 +234,7 @@
       "license_expression": "mit OR apache-2.0",
       "license_expression_spdx": "MIT OR Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR apache-2.0",
           "license_expression_spdx": "MIT OR Apache-2.0",
@@ -256,7 +256,7 @@
       "license_expression": "mit OR apache-2.0",
       "license_expression_spdx": "MIT OR Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit OR apache-2.0",
           "license_expression_spdx": "MIT OR Apache-2.0",
diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json
index 0fd63f6b1c4..d65e1d172a8 100644
--- a/tests/summarycode/data/score/no_license_text-expected.json
+++ b/tests/summarycode/data/score/no_license_text-expected.json
@@ -280,7 +280,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -302,7 +302,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 c14fa103743..44dc1cc7cf0 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
@@ -54,7 +54,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -76,7 +76,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -112,7 +112,7 @@
       "license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
       "license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-1.0-plus",
           "license_expression_spdx": "GPL-1.0-or-later",
@@ -162,7 +162,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 2eef2da34a6..1603b97fe35 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
@@ -42,7 +42,7 @@
       "license_expression": "gpl-2.0-plus",
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -64,7 +64,7 @@
       "license_expression": "gpl-3.0-plus",
       "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0-plus",
           "license_expression_spdx": "GPL-3.0-or-later",
diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json
index 5ebb659efef..031e9449edd 100644
--- a/tests/summarycode/data/summary/holders/clear_holder.expected.json
+++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json
@@ -42,7 +42,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -64,7 +64,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -100,7 +100,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json
index 0b4b3573b3b..3a038bc3482 100644
--- a/tests/summarycode/data/summary/holders/combined_holders.expected.json
+++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json
@@ -38,7 +38,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -60,7 +60,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -96,7 +96,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
index 33aa7aa0641..318db8db4dd 100644
--- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json
@@ -42,7 +42,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -64,7 +64,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
index 7107720a0c5..c79eb04ae1e 100644
--- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
+++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json
@@ -38,7 +38,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -60,7 +60,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -96,7 +96,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 c11fb3a5f0d..c9d955b6615 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
@@ -197,7 +197,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -219,7 +219,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -241,7 +241,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -263,7 +263,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -299,7 +299,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -321,7 +321,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -343,7 +343,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 cc29e8ff9fa..f2e8d96b727 100644
--- a/tests/summarycode/data/summary/single_file/single_file.expected.json
+++ b/tests/summarycode/data/summary/single_file/single_file.expected.json
@@ -24,7 +24,7 @@
       "license_expression": "jetty",
       "license_expression_spdx": "LicenseRef-scancode-jetty",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "jetty",
           "license_expression_spdx": "LicenseRef-scancode-jetty",
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 28ef4b2f588..72927f9a554 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
@@ -137,7 +137,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -159,7 +159,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -209,7 +209,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -231,7 +231,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -253,7 +253,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -275,7 +275,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown-license-reference",
           "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
@@ -311,7 +311,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 855448db8c1..a82e487c02c 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
@@ -126,7 +126,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
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 75a7fe9d75e..180ea9844cc 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
@@ -116,7 +116,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -138,7 +138,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -160,7 +160,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -182,7 +182,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -218,7 +218,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 7330b990871..384de11f4f8 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
@@ -38,7 +38,7 @@
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -60,7 +60,7 @@
       "license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
       "license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "apache-2.0",
           "license_expression_spdx": "Apache-2.0",
@@ -96,7 +96,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 21de9384488..1d7482c350a 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
@@ -7,7 +7,7 @@
       "license_expression": "gpl-2.0-plus",
       "license_expression_spdx": "GPL-2.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus",
           "license_expression_spdx": "GPL-2.0-or-later",
@@ -29,7 +29,7 @@
       "license_expression": "gpl-3.0-plus",
       "license_expression_spdx": "GPL-3.0-or-later",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-3.0-plus",
           "license_expression_spdx": "GPL-3.0-or-later",
diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
index 5924e154986..506f25c4167 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json
@@ -3339,7 +3339,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3361,7 +3361,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3383,7 +3383,7 @@
       "license_expression": "boost-1.0",
       "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "boost-1.0",
           "license_expression_spdx": "BSL-1.0",
@@ -3405,7 +3405,7 @@
       "license_expression": "cc-by-2.5",
       "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc-by-2.5",
           "license_expression_spdx": "CC-BY-2.5",
@@ -3427,7 +3427,7 @@
       "license_expression": "cc0-1.0",
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
@@ -3449,7 +3449,7 @@
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
       "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
@@ -3471,7 +3471,7 @@
       "license_expression": "lgpl-2.1-plus",
       "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1-plus",
           "license_expression_spdx": "LGPL-2.1-or-later",
@@ -3493,7 +3493,7 @@
       "license_expression": "mit-old-style",
       "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit-old-style",
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
@@ -3515,7 +3515,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 7,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3551,7 +3551,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3573,7 +3573,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3595,7 +3595,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
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 a94efb525c5..d1b8484a561 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
@@ -3339,7 +3339,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3361,7 +3361,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3383,7 +3383,7 @@
       "license_expression": "boost-1.0",
       "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "boost-1.0",
           "license_expression_spdx": "BSL-1.0",
@@ -3405,7 +3405,7 @@
       "license_expression": "cc-by-2.5",
       "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc-by-2.5",
           "license_expression_spdx": "CC-BY-2.5",
@@ -3427,7 +3427,7 @@
       "license_expression": "cc0-1.0",
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
@@ -3449,7 +3449,7 @@
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
       "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
@@ -3471,7 +3471,7 @@
       "license_expression": "lgpl-2.1-plus",
       "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1-plus",
           "license_expression_spdx": "LGPL-2.1-or-later",
@@ -3493,7 +3493,7 @@
       "license_expression": "mit-old-style",
       "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit-old-style",
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
@@ -3515,7 +3515,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 7,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3551,7 +3551,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3573,7 +3573,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3595,7 +3595,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
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 b03b1099a8c..d3ceaf9d067 100644
--- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
+++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json
@@ -3339,7 +3339,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3361,7 +3361,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -3383,7 +3383,7 @@
       "license_expression": "boost-1.0",
       "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "boost-1.0",
           "license_expression_spdx": "BSL-1.0",
@@ -3405,7 +3405,7 @@
       "license_expression": "cc-by-2.5",
       "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc-by-2.5",
           "license_expression_spdx": "CC-BY-2.5",
@@ -3427,7 +3427,7 @@
       "license_expression": "cc0-1.0",
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
@@ -3449,7 +3449,7 @@
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
       "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
@@ -3471,7 +3471,7 @@
       "license_expression": "lgpl-2.1-plus",
       "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1-plus",
           "license_expression_spdx": "LGPL-2.1-or-later",
@@ -3493,7 +3493,7 @@
       "license_expression": "mit-old-style",
       "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit-old-style",
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
@@ -3515,7 +3515,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 7,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3551,7 +3551,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3573,7 +3573,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -3595,7 +3595,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
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 02b14cbfb3c..36585556eb9 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
@@ -39,7 +39,7 @@
         "license_expression": "artistic-2.0",
         "license_expression_spdx": "Artistic-2.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "artistic-2.0",
             "license_expression_spdx": "Artistic-2.0",
@@ -61,7 +61,7 @@
         "license_expression": "boost-1.0",
         "license_expression_spdx": "BSL-1.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "boost-1.0",
             "license_expression_spdx": "BSL-1.0",
@@ -83,7 +83,7 @@
         "license_expression": "cc-by-2.5",
         "license_expression_spdx": "CC-BY-2.5",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "cc-by-2.5",
             "license_expression_spdx": "CC-BY-2.5",
@@ -105,7 +105,7 @@
         "license_expression": "cc0-1.0",
         "license_expression_spdx": "CC0-1.0",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "cc0-1.0",
             "license_expression_spdx": "CC0-1.0",
@@ -127,7 +127,7 @@
         "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
         "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
             "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
@@ -149,7 +149,7 @@
         "license_expression": "lgpl-2.1-plus",
         "license_expression_spdx": "LGPL-2.1-or-later",
         "detection_count": 3,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "lgpl-2.1-plus",
             "license_expression_spdx": "LGPL-2.1-or-later",
@@ -171,7 +171,7 @@
         "license_expression": "mit-old-style",
         "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "mit-old-style",
             "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
@@ -193,7 +193,7 @@
         "license_expression": "zlib",
         "license_expression_spdx": "Zlib",
         "detection_count": 7,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "zlib",
             "license_expression_spdx": "Zlib",
@@ -229,7 +229,7 @@
         "license_expression": "zlib",
         "license_expression_spdx": "Zlib",
         "detection_count": 2,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "zlib",
             "license_expression_spdx": "Zlib",
@@ -251,7 +251,7 @@
         "license_expression": "zlib",
         "license_expression_spdx": "Zlib",
         "detection_count": 2,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "zlib",
             "license_expression_spdx": "Zlib",
@@ -273,7 +273,7 @@
         "license_expression": "zlib",
         "license_expression_spdx": "Zlib",
         "detection_count": 1,
-        "sample_matches": [
+        "reference_matches": [
           {
             "license_expression": "zlib",
             "license_expression_spdx": "Zlib",
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 33f78b331ff..417fd479689 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
@@ -5,7 +5,7 @@
       "license_expression": "artistic-2.0",
       "license_expression_spdx": "Artistic-2.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "artistic-2.0",
           "license_expression_spdx": "Artistic-2.0",
@@ -27,7 +27,7 @@
       "license_expression": "boost-1.0",
       "license_expression_spdx": "BSL-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "boost-1.0",
           "license_expression_spdx": "BSL-1.0",
@@ -49,7 +49,7 @@
       "license_expression": "cc-by-2.5",
       "license_expression_spdx": "CC-BY-2.5",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc-by-2.5",
           "license_expression_spdx": "CC-BY-2.5",
@@ -71,7 +71,7 @@
       "license_expression": "cc0-1.0",
       "license_expression_spdx": "CC0-1.0",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "cc0-1.0",
           "license_expression_spdx": "CC0-1.0",
@@ -93,7 +93,7 @@
       "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
       "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "gpl-2.0-plus WITH ada-linking-exception",
           "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception",
@@ -115,7 +115,7 @@
       "license_expression": "lgpl-2.1-plus",
       "license_expression_spdx": "LGPL-2.1-or-later",
       "detection_count": 3,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "lgpl-2.1-plus",
           "license_expression_spdx": "LGPL-2.1-or-later",
@@ -137,7 +137,7 @@
       "license_expression": "mit-old-style",
       "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit-old-style",
           "license_expression_spdx": "LicenseRef-scancode-mit-old-style",
@@ -159,7 +159,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 7,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -195,7 +195,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -217,7 +217,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
@@ -239,7 +239,7 @@
       "license_expression": "zlib",
       "license_expression_spdx": "Zlib",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "zlib",
           "license_expression_spdx": "Zlib",
diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json
index 7a274000e08..5b3383304c9 100644
--- a/tests/summarycode/data/tallies/packages/expected.json
+++ b/tests/summarycode/data/tallies/packages/expected.json
@@ -32,17 +32,17 @@
           "license_expression_spdx": "LicenseRef-scancode-public-domain",
           "matches": [
             {
-              "score": 70.0,
+              "license_expression": "public-domain",
+              "spdx_license_expression": "LicenseRef-scancode-public-domain",
+              "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom",
+              "matcher": "2-aho",
+              "score": 70.0,
               "matched_length": 2,
               "match_coverage": 100.0,
-              "matcher": "2-aho",
-              "license_expression": "public-domain",
-              "spdx_license_expression": "LicenseRef-scancode-public-domain",
-              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_relevance": 70,
+              "rule_identifier": "public-domain_bare_words.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
               "matched_text": "- name: Public Domain"
             }
@@ -116,17 +116,17 @@
           "license_expression_spdx": "GPL-2.0-only",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "gpl-2.0",
+              "spdx_license_expression": "GPL-2.0-only",
+              "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST",
+              "matcher": "1-hash",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-hash",
-              "license_expression": "gpl-2.0",
-              "spdx_license_expression": "GPL-2.0-only",
-              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_relevance": 100,
+              "rule_identifier": "gpl-2.0_bare_single_word.RULE",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
               "matched_text": "GPLv2"
             }
@@ -193,17 +193,17 @@
           "license_expression_spdx": "MIT",
           "matches": [
             {
-              "score": 100.0,
+              "license_expression": "mit",
+              "spdx_license_expression": "MIT",
+              "from_file": "scan/scoped1/package.json",
               "start_line": 1,
               "end_line": 1,
-              "from_file": "scan/scoped1/package.json",
+              "matcher": "1-spdx-id",
+              "score": 100.0,
               "matched_length": 1,
               "match_coverage": 100.0,
-              "matcher": "1-spdx-id",
-              "license_expression": "mit",
-              "spdx_license_expression": "MIT",
-              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_relevance": 100,
+              "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
               "rule_url": null,
               "matched_text": "MIT"
             }
@@ -1155,17 +1155,17 @@
               "license_expression_spdx": "LicenseRef-scancode-public-domain",
               "matches": [
                 {
-                  "score": 70.0,
+                  "license_expression": "public-domain",
+                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
+                  "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "2-aho",
+                  "score": 70.0,
                   "matched_length": 2,
                   "match_coverage": 100.0,
-                  "matcher": "2-aho",
-                  "license_expression": "public-domain",
-                  "spdx_license_expression": "LicenseRef-scancode-public-domain",
-                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_relevance": 70,
+                  "rule_identifier": "public-domain_bare_words.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE",
                   "matched_text": "- name: Public Domain"
                 }
@@ -1259,17 +1259,17 @@
               "license_expression_spdx": "GPL-2.0-only",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "gpl-2.0",
+                  "spdx_license_expression": "GPL-2.0-only",
+                  "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-hash",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-hash",
-                  "license_expression": "gpl-2.0",
-                  "spdx_license_expression": "GPL-2.0-only",
-                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_relevance": 100,
+                  "rule_identifier": "gpl-2.0_bare_single_word.RULE",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_bare_single_word.RULE",
                   "matched_text": "GPLv2"
                 }
@@ -1349,17 +1349,17 @@
               "license_expression_spdx": "MIT",
               "matches": [
                 {
-                  "score": 100.0,
+                  "license_expression": "mit",
+                  "spdx_license_expression": "MIT",
+                  "from_file": "scan/scoped1/package.json",
                   "start_line": 1,
                   "end_line": 1,
-                  "from_file": null,
+                  "matcher": "1-spdx-id",
+                  "score": 100.0,
                   "matched_length": 1,
                   "match_coverage": 100.0,
-                  "matcher": "1-spdx-id",
-                  "license_expression": "mit",
-                  "spdx_license_expression": "MIT",
-                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_relevance": 100,
+                  "rule_identifier": "spdx-license-identifier-mit-5da48780aba670b0860c46d899ed42a0f243ff06",
                   "rule_url": null,
                   "matched_text": "MIT"
                 }
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 be8a0e5247d..1e0999ef58d 100644
--- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
+++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json
@@ -178,7 +178,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 2,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -200,7 +200,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -222,7 +222,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -244,7 +244,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
@@ -266,7 +266,7 @@
       "license_expression": "mit",
       "license_expression_spdx": "MIT",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "mit",
           "license_expression_spdx": "MIT",
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 bf472b41a35..047eb0ba37e 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
@@ -8,7 +8,7 @@
       "detection_log": [
         "unknown-match"
       ],
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown",
           "license_expression_spdx": "LicenseRef-scancode-unknown",
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 d8fce0527f3..2938c88636d 100644
--- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
+++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json
@@ -5,7 +5,7 @@
       "license_expression": "unknown",
       "license_expression_spdx": "LicenseRef-scancode-unknown",
       "detection_count": 1,
-      "sample_matches": [
+      "reference_matches": [
         {
           "license_expression": "unknown",
           "license_expression_spdx": "LicenseRef-scancode-unknown",

From f016ef91d20ff895fd1cfba6fc1c57fc1588e3be Mon Sep 17 00:00:00 2001
From: Ayan Sinha Mahapatra 
Date: Wed, 17 Jan 2024 01:26:34 +0530
Subject: [PATCH 11/11] Update CHANGELOG and Output Format Version

Signed-off-by: Ayan Sinha Mahapatra 
---
 CHANGELOG.rst          | 51 ++++++++++++++++++++++++++++++++++++++++++
 src/scancode_config.py |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf9daae9a42..23ac1e8ba8c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,57 @@ v33.0.0 (next next, roadmap)
 v32.1.0 (next, roadmap)
 ----------------------------
 
+Major API/other changes:
+
+- Output Format Version updated to 3.1.0 (minor version bump)
+- Drops python 3.7 and adopts python 3.12
+- New license match attributes:
+  - ``from_file``
+  - ``matched_text_diagnostics`` is added for ``--license-text-diagnostics``
+- In codebase-level ``license_detections`` we have a new attribute
+  ``reference_matches``
+- SPDX license expressions everywhere side-by-side with ScanCode
+  license expressions.
+- All rule attribute level data provided in codebase level ``todo`` items.
+
+Changes in Output Data Structure:
+
+- The data structure of the JSON output has changed for
+  licenses at file level, and license detections at top-level.
+  But note that all the changes are additions to the JSON output,
+  so we have a minor version bump ``3.0.0`` to ``3.1.0``:
+
+  - There is a new attribute ``from_file`` in ``matches`` which is in
+    ``license_detections`` in:
+    * File level ``license_detections``
+    * Codebase level ``license_detections``
+    * ``license_detections`` and  ``other_license_detections`` in
+      file-level ``package_data``
+    * ``license_detections`` and  ``other_license_detections`` in
+      codebase level ``packages``
+  
+  - On using the CLI option ``--license-text-diagnostics`` there is
+    now a new license match attribute ``matched_text_diagnostics``
+    with the matched text and highlighted diagnostics, instead of
+    having this replace the plain ``matched_text``.
+
+  - A new ``reference_matches`` attribute is added to codebase-level
+    ``license_detections`` which is same as the ``matches`` attribute
+    in other license detections.
+  
+  - We now have SPDX license expressions everywhere we have
+    ScanCode license expressions for ease of use and adopting
+    SPDX everywhere. A new attribute ``license_expression_spdx``
+    is added to:
+    - ``license_detections`` in file and codebase level
+    - in package ``license_detections`` and ``other_license_detections``
+    - ``matches`` for ``license_detections`` everywhere
+
+  - Adds all rule atrribute level info in codebase level ``todo``
+    data, to assist in review. This includes length, text, notes,
+    referenced_filenames, and the boolean attributes (like
+    is_license_notice, is_license_intro etc, as applicable).
+
 - A new field in packages with the license category for the
   detected license expression and also an API function to
   compute license categories from license expressions.
diff --git a/src/scancode_config.py b/src/scancode_config.py
index a804125b62e..7044a853e52 100644
--- a/src/scancode_config.py
+++ b/src/scancode_config.py
@@ -141,7 +141,7 @@ def _create_dir(location):
 
 # See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
 # on the data format version
-__output_format_version__ = '3.0.0'
+__output_format_version__ = '3.1.0'
 
 #
 spdx_license_list_version = '3.22'